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

Add control on BasketRepo

Browse Source
This commit is contained in:
Romain Neutron
2012-02-17 16:08:00 +01:00
parent 12b362ccec
commit 2590ab6ddd
16 changed files with 37 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -237,6 +237,7 @@ return call_user_func(
$basket = $repository->findUserBasket( $basket = $repository->findUserBasket(
$ssel_id $ssel_id
, $app['Core']->getAuthenticatedUser() , $app['Core']->getAuthenticatedUser()
, false
); );
/* @var $twig \Twig_Environment */ /* @var $twig \Twig_Environment */
@@ -279,6 +280,7 @@ return call_user_func(
$basket = $repository->findUserBasket( $basket = $repository->findUserBasket(
$ssel_id $ssel_id
, $app['Core']->getAuthenticatedUser() , $app['Core']->getAuthenticatedUser()
, false
); );
/* @var $twig \Twig_Environment */ /* @var $twig \Twig_Environment */
@@ -353,6 +355,7 @@ return call_user_func(
$basket = $repository->findUserBasket( $basket = $repository->findUserBasket(
$ssel_id $ssel_id
, $app['Core']->getAuthenticatedUser() , $app['Core']->getAuthenticatedUser()
, false
); );
$response = new Response($twig->render($template, array('basket' => $basket))); $response = new Response($twig->render($template, array('basket' => $basket)));
@@ -495,6 +498,7 @@ return call_user_func(
$basket = $repository->findUserBasket( $basket = $repository->findUserBasket(
$ssel_id $ssel_id
, $user , $user
, false
); );
if (!$basket->getValidation()) if (!$basket->getValidation())

22
lib/Alchemy/Phrasea/Controller/Prod/Basket.php
View File

@@ -128,7 +128,7 @@ class Basket implements ControllerProviderInterface
$em = $app['Core']->getEntityManager(); $em = $app['Core']->getEntityManager();
$basket = $em->getRepository('\Entities\Basket') $basket = $em->getRepository('\Entities\Basket')
->findUserBasket($basket_id, $app['Core']->getAuthenticatedUser()); ->findUserBasket($basket_id, $app['Core']->getAuthenticatedUser(), true);
$em->remove($basket); $em->remove($basket);
$em->flush(); $em->flush();
@@ -162,7 +162,7 @@ class Basket implements ControllerProviderInterface
$em = $app['Core']->getEntityManager(); $em = $app['Core']->getEntityManager();
$basket = $em->getRepository('\Entities\Basket') $basket = $em->getRepository('\Entities\Basket')
->findUserBasket($basket_id, $app['Core']->getAuthenticatedUser()); ->findUserBasket($basket_id, $app['Core']->getAuthenticatedUser(), true);
foreach ($basket->getElements() as $basket_element) foreach ($basket->getElements() as $basket_element)
{ {
@@ -204,7 +204,7 @@ class Basket implements ControllerProviderInterface
$em = $app['Core']->getEntityManager(); $em = $app['Core']->getEntityManager();
$basket = $em->getRepository('\Entities\Basket') $basket = $em->getRepository('\Entities\Basket')
->findUserBasket($basket_id, $app['Core']->getAuthenticatedUser()); ->findUserBasket($basket_id, $app['Core']->getAuthenticatedUser(), true);
$basket->setName($request->get('name', '')); $basket->setName($request->get('name', ''));
$basket->setDescription($request->get('description')); $basket->setDescription($request->get('description'));
@@ -240,7 +240,7 @@ class Basket implements ControllerProviderInterface
$em = $app['Core']->getEntityManager(); $em = $app['Core']->getEntityManager();
$basket = $em->getRepository('\Entities\Basket') $basket = $em->getRepository('\Entities\Basket')
->findUserBasket($basket_id, $app['Core']->getAuthenticatedUser()); ->findUserBasket($basket_id, $app['Core']->getAuthenticatedUser(), true);
/* @var $twig \Twig_Environment */ /* @var $twig \Twig_Environment */
$twig = $app['Core']->getTwig(); $twig = $app['Core']->getTwig();
@@ -265,7 +265,7 @@ class Basket implements ControllerProviderInterface
$em = $app['Core']->getEntityManager(); $em = $app['Core']->getEntityManager();
$basket = $em->getRepository('\Entities\Basket') $basket = $em->getRepository('\Entities\Basket')
->findUserBasket($basket_id, $app['Core']->getAuthenticatedUser()); ->findUserBasket($basket_id, $app['Core']->getAuthenticatedUser(), true);
/* @var $twig \Twig_Environment */ /* @var $twig \Twig_Environment */
$twig = $app['Core']->getTwig(); $twig = $app['Core']->getTwig();
@@ -290,7 +290,7 @@ class Basket implements ControllerProviderInterface
$em = $app['Core']->getEntityManager(); $em = $app['Core']->getEntityManager();
$basket = $em->getRepository('\Entities\Basket') $basket = $em->getRepository('\Entities\Basket')
->findUserBasket($basket_id, $app['Core']->getAuthenticatedUser()); ->findUserBasket($basket_id, $app['Core']->getAuthenticatedUser(), true);
$archive_status = !!$request->get('archive'); $archive_status = !!$request->get('archive');
@@ -337,7 +337,7 @@ class Basket implements ControllerProviderInterface
$em = $app['Core']->getEntityManager(); $em = $app['Core']->getEntityManager();
$basket = $em->getRepository('\Entities\Basket') $basket = $em->getRepository('\Entities\Basket')
->findUserBasket($basket_id, $app['Core']->getAuthenticatedUser()); ->findUserBasket($basket_id, $app['Core']->getAuthenticatedUser(), true);
$user = $app['Core']->getAuthenticatedUser(); $user = $app['Core']->getAuthenticatedUser();
/* @var $user \User_Adapter */ /* @var $user \User_Adapter */
@@ -413,7 +413,7 @@ class Basket implements ControllerProviderInterface
/* @var $em \Doctrine\ORM\EntityManager */ /* @var $em \Doctrine\ORM\EntityManager */
$basket = $em->getRepository('\Entities\Basket') $basket = $em->getRepository('\Entities\Basket')
->findUserBasket($basket_id, $app['Core']->getAuthenticatedUser()); ->findUserBasket($basket_id, $app['Core']->getAuthenticatedUser(), true);
$user = $app['Core']->getAuthenticatedUser(); $user = $app['Core']->getAuthenticatedUser();
/* @var $user \User_Adapter */ /* @var $user \User_Adapter */
@@ -475,9 +475,9 @@ class Basket implements ControllerProviderInterface
$controllers->get('/{basket_id}/', function(Application $app, Request $request, $basket_id) $controllers->get('/{basket_id}/', function(Application $app, Request $request, $basket_id)
{ {
$em = $app['Core']->getEntityManager(); $em = $app['Core']->getEntityManager();
$basket = $em->getRepository('\Entities\Basket') $basket = $em->getRepository('\Entities\Basket')
->findUserBasket($basket_id, $app['Core']->getAuthenticatedUser()); ->findUserBasket($basket_id, $app['Core']->getAuthenticatedUser(), false);
if ($basket->getIsRead() === false) if ($basket->getIsRead() === false)
{ {
@@ -495,7 +495,7 @@ class Basket implements ControllerProviderInterface
); );
$html = $twig->render('prod/WorkZone/Basket.html.twig', $params); $html = $twig->render('prod/WorkZone/Basket.html.twig', $params);
return new Response($html); return new Response($html);
})->assert('basket_id', '\d+'); })->assert('basket_id', '\d+');

2
lib/Alchemy/Phrasea/Controller/Prod/Tooltip.php
View File

@@ -40,7 +40,7 @@ class Tooltip implements ControllerProviderInterface
$em = $app['Core']->getEntityManager(); $em = $app['Core']->getEntityManager();
$basket = $em->getRepository('\Entities\Basket') $basket = $em->getRepository('\Entities\Basket')
->findUserBasket($basket_id, $app['Core']->getAuthenticatedUser()); ->findUserBasket($basket_id, $app['Core']->getAuthenticatedUser(), false);
/* @var $twig \Twig_Environment */ /* @var $twig \Twig_Environment */
$twig = $app['Core']->getTwig(); $twig = $app['Core']->getTwig();

2
lib/Alchemy/Phrasea/Controller/Prod/WorkZone.php
View File

@@ -113,7 +113,7 @@ class WorkZone implements ControllerProviderInterface
$em = $app['Core']->getEntityManager(); $em = $app['Core']->getEntityManager();
$basket = $em->getRepository('\Entities\Basket') $basket = $em->getRepository('\Entities\Basket')
->findUserBasket($basket_id, $app['Core']->getAuthenticatedUser()); ->findUserBasket($basket_id, $app['Core']->getAuthenticatedUser(), false);
$params = array( $params = array(
'Basket' => $basket 'Basket' => $basket

2
lib/Alchemy/Phrasea/Helper/Record/Helper.php
View File

@@ -116,7 +116,7 @@ class Helper extends \Alchemy\Phrasea\Helper\Helper
$repository = $em->getRepository('\Entities\Basket'); $repository = $em->getRepository('\Entities\Basket');
/* @var $$repository \Repositories\BasketRepository */ /* @var $$repository \Repositories\BasketRepository */
$Basket = $repository->findUserBasket($Request->get('ssel'), $this->getCore()->getAuthenticatedUser()); $Basket = $repository->findUserBasket($Request->get('ssel'), $this->getCore()->getAuthenticatedUser(), false);
$this->selection->load_basket($Basket); $this->selection->load_basket($Basket);

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

@@ -132,7 +132,7 @@ class BasketRepository extends EntityRepository
* @param \User_Adapter $user * @param \User_Adapter $user
* @return \Entities\Basket * @return \Entities\Basket
*/ */
public function findUserBasket($basket_id, \User_Adapter $user) public function findUserBasket($basket_id, \User_Adapter $user, $requireOwner)
{ {
$dql = 'SELECT b, e, s, p $dql = 'SELECT b, e, s, p
FROM Entities\Basket b FROM Entities\Basket b
@@ -158,7 +158,7 @@ class BasketRepository extends EntityRepository
{ {
$participant = false; $participant = false;
if ($basket->getValidation()) if ($basket->getValidation() && !$requireOwner)
{ {
try try
{ {

8
lib/classes/API/V1/adapter.class.php
View File

@@ -660,7 +660,7 @@ class API_V1_adapter extends API_V1_Abstract
/* @var $repository \Repositories\BasketRepository */ /* @var $repository \Repositories\BasketRepository */
$Basket = $repository->findUserBasket($basket_id, $this->core->getAuthenticatedUser()); $Basket = $repository->findUserBasket($basket_id, $this->core->getAuthenticatedUser(), true);
$em->remove($Basket); $em->remove($Basket);
$em->flush(); $em->flush();
@@ -683,7 +683,7 @@ class API_V1_adapter extends API_V1_Abstract
/* @var $repository \Repositories\BasketRepository */ /* @var $repository \Repositories\BasketRepository */
$Basket = $repository->findUserBasket($basket_id, $this->core->getAuthenticatedUser()); $Basket = $repository->findUserBasket($basket_id, $this->core->getAuthenticatedUser(), false);
$result->set_datas( $result->set_datas(
array("basket_elements" => array("basket_elements" =>
@@ -783,7 +783,7 @@ class API_V1_adapter extends API_V1_Abstract
/* @var $repository \Repositories\BasketRepository */ /* @var $repository \Repositories\BasketRepository */
$Basket = $repository->findUserBasket($basket_id, $this->core->getAuthenticatedUser()); $Basket = $repository->findUserBasket($basket_id, $this->core->getAuthenticatedUser(), true);
$Basket->setName($name); $Basket->setName($name);
$em->merge($Basket); $em->merge($Basket);
@@ -819,7 +819,7 @@ class API_V1_adapter extends API_V1_Abstract
/* @var $repository \Repositories\BasketRepository */ /* @var $repository \Repositories\BasketRepository */
$Basket = $repository->findUserBasket($basket_id, $this->core->getAuthenticatedUser()); $Basket = $repository->findUserBasket($basket_id, $this->core->getAuthenticatedUser(), true);
$Basket->setDescription($desc); $Basket->setDescription($desc);
$em->merge($Basket); $em->merge($Basket);

4
lib/classes/eventsmanager/notify/orderdeliver.class.php
View File

@@ -150,7 +150,7 @@ class eventsmanager_notify_orderdeliver extends eventsmanager_notifyAbstract
$em = $this->core->getEntityManager(); $em = $this->core->getEntityManager();
$repository = $em->getRepository('\Entities\Basket'); $repository = $em->getRepository('\Entities\Basket');
$basket = $repository->findUserBasket($ssel_id, $this->core->getAuthenticatedUser()); $basket = $repository->findUserBasket($ssel_id, $this->core->getAuthenticatedUser(), false);
} }
catch (Exception $e) catch (Exception $e)
{ {
@@ -202,7 +202,7 @@ class eventsmanager_notify_orderdeliver extends eventsmanager_notifyAbstract
$em = $this->core->getEntityManager(); $em = $this->core->getEntityManager();
$repository = $em->getRepository('\Entities\Basket'); $repository = $em->getRepository('\Entities\Basket');
$basket = $repository->findUserBasket($ssel_id, $this->core->getAuthenticatedUser()); $basket = $repository->findUserBasket($ssel_id, $this->core->getAuthenticatedUser(), false);
} }
catch (Exception $e) catch (Exception $e)
{ {

2
lib/classes/eventsmanager/notify/validate.class.php
View File

@@ -143,7 +143,7 @@ class eventsmanager_notify_validate extends eventsmanager_notifyAbstract
$em = $this->core->getEntityManager(); $em = $this->core->getEntityManager();
$repository = $em->getRepository('\Entities\Basket'); $repository = $em->getRepository('\Entities\Basket');
$basket = $repository->findUserBasket($ssel_id, $this->core->getAuthenticatedUser()); $basket = $repository->findUserBasket($ssel_id, $this->core->getAuthenticatedUser(), false);
$basket_name = trim($basket->getName()) ?: _('Une selection'); $basket_name = trim($basket->getName()) ?: _('Une selection');
} }

4
lib/classes/eventsmanager/notify/validationdone.class.php
View File

@@ -146,7 +146,7 @@ class eventsmanager_notify_validationdone extends eventsmanager_notifyAbstract
$em = $this->core->getEntityManager(); $em = $this->core->getEntityManager();
$repository = $em->getRepository('\Entities\Basket'); $repository = $em->getRepository('\Entities\Basket');
$basket = $repository->findUserBasket($ssel_id, $this->core->getAuthenticatedUser()); $basket = $repository->findUserBasket($ssel_id, $this->core->getAuthenticatedUser(), false);
} }
catch (Exception $e) catch (Exception $e)
{ {
@@ -199,7 +199,7 @@ class eventsmanager_notify_validationdone extends eventsmanager_notifyAbstract
$em = $this->core->getEntityManager(); $em = $this->core->getEntityManager();
$repository = $em->getRepository('\Entities\Basket'); $repository = $em->getRepository('\Entities\Basket');
$basket = $repository->findUserBasket($ssel_id, $this->core->getAuthenticatedUser()); $basket = $repository->findUserBasket($ssel_id, $this->core->getAuthenticatedUser(), false);
} }
catch (Exception $e) catch (Exception $e)
{ {

2
lib/classes/eventsmanager/notify/validationreminder.class.php
View File

@@ -159,7 +159,7 @@ class eventsmanager_notify_validationreminder extends eventsmanager_notifyAbstra
$em = $this->core->getEntityManager(); $em = $this->core->getEntityManager();
$repository = $em->getRepository('\Entities\Basket'); $repository = $em->getRepository('\Entities\Basket');
$basket = $repository->findUserBasket($ssel_id, $this->core->getAuthenticatedUser()); $basket = $repository->findUserBasket($ssel_id, $this->core->getAuthenticatedUser(), false);
$basket_name = trim($basket->getName()) ? : _('Une selection'); $basket_name = trim($basket->getName()) ? : _('Une selection');
} }

2
lib/classes/record/preview.class.php
View File

@@ -143,7 +143,7 @@ class record_preview extends record_adapter
$repository = $em->getRepository('\Entities\Basket'); $repository = $em->getRepository('\Entities\Basket');
/* @var $repository \Repositories\BasketRepository */ /* @var $repository \Repositories\BasketRepository */
$Basket = $repository->findUserBasket($contId, $Core->getAuthenticatedUser()); $Basket = $repository->findUserBasket($contId, $Core->getAuthenticatedUser(), false);
/* @var $Basket \Entities\Basket */ /* @var $Basket \Entities\Basket */
$this->container = $Basket; $this->container = $Basket;

2
lib/classes/set/export.class.php
View File

@@ -63,7 +63,7 @@ class set_export extends set_abstract
$repository = $em->getRepository('\Entities\Basket'); $repository = $em->getRepository('\Entities\Basket');
/* @var $repository \Repositories\BasketRepository */ /* @var $repository \Repositories\BasketRepository */
$Basket = $repository->findUserBasket($sstid, $user); $Basket = $repository->findUserBasket($sstid, $user, false);
foreach ($Basket->getElements() as $basket_element) foreach ($Basket->getElements() as $basket_element)
{ {

6
www/client/baskets.php
View File

@@ -41,7 +41,7 @@ if ($Request->get('act') == "ADDIMG" && ($Request->get("p0") != "" && $Request->
{ {
$repository = $em->getRepository('\Entities\Basket'); $repository = $em->getRepository('\Entities\Basket');
/* @var $repository \Repositories\BasketRepository */ /* @var $repository \Repositories\BasketRepository */
$basket = $repository->findUserBasket($Request->get('courChuId'), $user); $basket = $repository->findUserBasket($Request->get('courChuId'), $user, true);
$sbas_id = phrasea::sbasFromBas($Request->get('bas')); $sbas_id = phrasea::sbasFromBas($Request->get('bas'));
$record = new record_adapter($sbas_id, $Request->get('p0')); $record = new record_adapter($sbas_id, $Request->get('p0'));
@@ -61,7 +61,7 @@ if ($Request->get('act') == "DELCHU" && ($Request->get("p0") != "" && $Request->
{ {
$repository = $em->getRepository('\Entities\Basket'); $repository = $em->getRepository('\Entities\Basket');
/* @var $repository \Repositories\BasketRepository */ /* @var $repository \Repositories\BasketRepository */
$basket = $repository->findUserBasket($Request->get('courChuId'), $user); $basket = $repository->findUserBasket($Request->get('courChuId'), $user, true);
$em->remove($basket); $em->remove($basket);
$em->flush(); $em->flush();
@@ -142,7 +142,7 @@ $out .= '</td><td style="width:40%">';
$em = $Core->getEntityManager(); $em = $Core->getEntityManager();
$repository = $em->getRepository('\Entities\Basket'); $repository = $em->getRepository('\Entities\Basket');
/* @var $repository \Repositories\BasketRepository */ /* @var $repository \Repositories\BasketRepository */
$basket = $repository->findUserBasket($courChuId, $user); $basket = $repository->findUserBasket($courChuId, $user, true);
$jscriptnochu = $basket->getName() . " : " . sprintf(_('paniers:: %d documents dans le panier'), $basket->getElements()->count()); $jscriptnochu = $basket->getName() . " : " . sprintf(_('paniers:: %d documents dans le panier'), $basket->getElements()->count());

2
www/include/download.php
View File

@@ -48,7 +48,7 @@ if ($parm["ssttid"] != "")
/* @var $repository \Repositories\BasketRepository */ /* @var $repository \Repositories\BasketRepository */
$Basket = $repository->findUserBasket($Request->get('ssttid'), $Core->getAuthenticatedUser()); $Basket = $repository->findUserBasket($Request->get('ssttid'), $Core->getAuthenticatedUser(), false);
$exportname = str_replace(' ', '_', $basket->getName()) . "_" . date("Y-n-d"); $exportname = str_replace(' ', '_', $basket->getName()) . "_" . date("Y-n-d");
} }

2
www/prod/docfunction.php
View File

@@ -243,7 +243,7 @@ $user = User_Adapter::getInstance($usr_id, $appbox);
$repository = $em->getRepository('\Entities\Basket'); $repository = $em->getRepository('\Entities\Basket');
/* @var $repository \Repositories\BasketRepository */ /* @var $repository \Repositories\BasketRepository */
$Basket = $repository->findUserBasket($Request->get('SSTTID'), $Core->getAuthenticatedUser()); $Basket = $repository->findUserBasket($Request->get('SSTTID'), $Core->getAuthenticatedUser(), false);
foreach ($Basket->getElements() as $basket_element) foreach ($Basket->getElements() as $basket_element)
{ {