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

fix #504 Lightbox : impossible de transmettre un rapport

Browse Source
This commit is contained in:
Nicolas Le Goff
2012-03-05 12:49:56 +01:00
parent b2e62ddfcc
commit dbfac64b4a
2 changed files with 35 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/Alchemy/Phrasea/Application/Lightbox.php
View File

@@ -232,7 +232,7 @@ return call_user_func(
$repository = $em->getRepository('\Entities\Basket'); $repository = $em->getRepository('\Entities\Basket');
/* @var $repository \Repositories\BasketRepository */ /* @var $repository \Repositories\BasketRepository */
$basket_collection = $repository->findActiveByUser( $basket_collection = $repository->findActiveValidationAndBasketByUser(
$app['Core']->getAuthenticatedUser() $app['Core']->getAuthenticatedUser()
); );
@@ -290,10 +290,10 @@ return call_user_func(
$repository = $em->getRepository('\Entities\Basket'); $repository = $em->getRepository('\Entities\Basket');
/* @var $repository \Repositories\BasketRepository */ /* @var $repository \Repositories\BasketRepository */
$basket_collection = $repository->findActiveByUser( $basket_collection = $repository->findActiveValidationAndBasketByUser(
$app['Core']->getAuthenticatedUser() $app['Core']->getAuthenticatedUser()
); );
$basket = $repository->findUserBasket( $basket = $repository->findUserBasket(
$ssel_id $ssel_id
, $app['Core']->getAuthenticatedUser() , $app['Core']->getAuthenticatedUser()

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

@@ -301,5 +301,37 @@ class BasketRepository extends EntityRepository
return array('count' => $count, 'result' => $result); return array('count' => $count, 'result' => $result);
} }
/**
* Return all actives validation where current user is involved and user basket
* @param \User_Adapter $user
* @param type $sort
* @return Array
*/
public function findActiveValidationAndBasketByUser(\User_Adapter $user, $sort = null)
{
$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
AND b.archived = false) OR (b.usr_id != :usr_id AND p.usr_id = :usr_id
AND (s.expires IS NULL OR s.expires > CURRENT_TIMESTAMP()))';
if ($sort == 'date')
{
$dql .= ' ORDER BY b.created DESC, e.ord ASC';
}
elseif ($sort == 'name')
{
$dql .= ' ORDER BY b.name ASC, e.ord ASC';
}
$query = $this->_em->createQuery($dql);
$query->setParameters(array('usr_id' => $user->get_id()));
return $query->getResult();
}
} }