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

Fix basket : elements are nt retrive by order

Browse Source
This commit is contained in:
Romain Neutron
2012-03-12 17:19:24 +01:00
parent da054b4275
commit aede5888b8
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -137,7 +137,7 @@ class BasketRepository extends EntityRepository
*/
public function findUserBasket($basket_id, \User_Adapter $user, $requireOwner)
{
$dql = 'SELECT b
$dql = 'SELECT b, e
FROM Entities\Basket b
LEFT JOIN b.elements e
WHERE b.id = :basket_id
@@ -158,7 +158,6 @@ class BasketRepository extends EntityRepository
{
$participant = false;
$basket = $this->_em->merge($basket);
if ($basket->getValidation() && !$requireOwner)
{
try
@@ -183,7 +182,7 @@ class BasketRepository extends EntityRepository
public function findContainingRecordForUser(\record_adapter $record, \User_Adapter $user)
{
$dql = 'SELECT b
$dql = 'SELECT b, e
FROM Entities\Basket b
JOIN b.elements e
WHERE e.record_id = :record_id AND e.sbas_id = e.sbas_id
@@ -208,7 +207,7 @@ class BasketRepository extends EntityRepository
switch ($type)
{
case self::RECEIVED:
$dql = 'SELECT b
$dql = 'SELECT b, e
FROM Entities\Basket b
JOIN b.elements e
WHERE b.usr_id = :usr_id AND b.pusher_id IS NOT NULL';
@@ -217,7 +216,7 @@ class BasketRepository extends EntityRepository
);
break;
case self::VALIDATION_DONE:
$dql = 'SELECT b
$dql = 'SELECT b, e
FROM Entities\Basket b
JOIN b.elements e
JOIN b.validation s
@@ -229,7 +228,7 @@ class BasketRepository extends EntityRepository
);
break;
case self::VALIDATION_SENT:
$dql = 'SELECT b
$dql = 'SELECT b, e
FROM Entities\Basket b
JOIN b.elements e
JOIN b.validation v
@@ -239,7 +238,7 @@ class BasketRepository extends EntityRepository
);
break;
default:
$dql = 'SELECT b
$dql = 'SELECT b, e
FROM Entities\Basket b
LEFT JOIN b.elements e
LEFT JOIN b.validation s
@@ -251,7 +250,7 @@ class BasketRepository extends EntityRepository
);
break;
case self::MYBASKETS:
$dql = 'SELECT b
$dql = 'SELECT b, e
FROM Entities\Basket b
LEFT JOIN b.elements e
LEFT JOIN b.validation s
@@ -300,7 +299,7 @@ class BasketRepository extends EntityRepository
*/
public function findActiveValidationAndBasketByUser(\User_Adapter $user, $sort = null)
{
$dql = 'SELECT b
$dql = 'SELECT b, e
FROM Entities\Basket b
LEFT JOIN b.elements e
LEFT JOIN b.validation s