hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-23 18:03:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update baskets fix

Browse Source
This commit is contained in:
Romain Neutron
2012-03-05 18:03:42 +01:00
parent cedd6b54a2
commit c1af665180
3 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/Doctrine/Repositories/BasketRepository.php
View File

@@ -261,7 +261,7 @@ class BasketRepository extends EntityRepository
default: default:
$dql = 'SELECT b, e, s, p $dql = 'SELECT b, e, s, p
FROM Entities\Basket b FROM Entities\Basket b
JOIN b.elements e LEFT JOIN b.elements e
LEFT JOIN b.validation s LEFT JOIN b.validation s
LEFT JOIN s.participants p LEFT JOIN s.participants p
WHERE (b.usr_id = :usr_id OR p.usr_id = :validating_usr_id)'; WHERE (b.usr_id = :usr_id OR p.usr_id = :validating_usr_id)';
@@ -270,6 +270,17 @@ class BasketRepository extends EntityRepository
'validating_usr_id' => $user->get_id() 'validating_usr_id' => $user->get_id()
); );
break; break;
case self::MYBASKETS:
$dql = 'SELECT b, e, s, p
FROM Entities\Basket b
LEFT JOIN b.elements e
LEFT JOIN b.validation s
LEFT JOIN s.participants p
WHERE (b.usr_id = :usr_id)';
$params = array(
'usr_id' => $user->get_id()
);
break;
} }
if (ctype_digit($year) && strlen($year) == 4) if (ctype_digit($year) && strlen($year) == 4)

2
templates/web/prod/WorkZone/Browser/Basket.html.twig
View File

@@ -11,6 +11,7 @@
<td> <td>
<h1 class="title"> <h1 class="title">
<img class="loader" src="/skins/prod/Basket/Browser/loader.gif" /> <img class="loader" src="/skins/prod/Basket/Browser/loader.gif" />
{% if Basket.getValidation() is empty or Basket.getValidation().isInitiator(user) %}
<a href="/prod/baskets/{{ Basket.getId() }}/archive/?archive=1" class="archiver archive_toggler" style="display:{{ Basket.getArchived ? 'none' : '' }};"> <a href="/prod/baskets/{{ Basket.getId() }}/archive/?archive=1" class="archiver archive_toggler" style="display:{{ Basket.getArchived ? 'none' : '' }};">
<span> <span>
<img src="/skins/prod/Basket/Browser/archive.png"/> <img src="/skins/prod/Basket/Browser/archive.png"/>
@@ -21,6 +22,7 @@
<img src="/skins/prod/Basket/Browser/archived.png"/> <img src="/skins/prod/Basket/Browser/archived.png"/>
</span> </span>
</a> </a>
{% endif %}
<a class="basket_link" href="#"> <a class="basket_link" href="#">
{{ Basket.getName() }} {{ Basket.getName() }}
</a> </a>

2
templates/web/prod/WorkZone/Browser/Results.html.twig
View File

@@ -49,6 +49,7 @@
<td class="content"> <td class="content">
<h1 class="title"> <h1 class="title">
<img class="loader" src="/skins/prod/Basket/Browser/loader.gif" /> <img class="loader" src="/skins/prod/Basket/Browser/loader.gif" />
{% if Basket.getValidation() is empty or Basket.getValidation().isInitiator(user) %}
<a href="/prod/baskets/{{ Basket.getId() }}/archive/?archive=1" class="archiver archive_toggler" style="display:{{ Basket.getArchived ? 'none' : '' }};"> <a href="/prod/baskets/{{ Basket.getId() }}/archive/?archive=1" class="archiver archive_toggler" style="display:{{ Basket.getArchived ? 'none' : '' }};">
<span> <span>
<img src="/skins/prod/Basket/Browser/archive.png"/> <img src="/skins/prod/Basket/Browser/archive.png"/>
@@ -59,6 +60,7 @@
<img src="/skins/prod/Basket/Browser/archived.png"/> <img src="/skins/prod/Basket/Browser/archived.png"/>
</span> </span>
</a> </a>
{% endif %}
<a class="basket_link" href="/prod/WorkZone/Browse/Basket/{{ Basket.getId() }}/"> <a class="basket_link" href="/prod/WorkZone/Browse/Basket/{{ Basket.getId() }}/">
{{ Basket.getName() }} {{ Basket.getName() }}
</a> </a>