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

Add registration and basket repositories as a service

Browse Source
This commit is contained in:
Romain Neutron
2014-02-27 17:07:10 +01:00
parent 0e95357060
commit a72d8ccabc
13 changed files with 24 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/Alchemy/Phrasea/Controller/Admin/Users.php
View File

@@ -359,7 +359,7 @@ class Users implements ControllerProviderInterface
$models = $app['repo.users']->findTemplateOwner($app['authentication']->getUser()); $models = $app['repo.users']->findTemplateOwner($app['authentication']->getUser());
$userRegistrations = []; $userRegistrations = [];
foreach ($app['manipulator.registration']->getRepository()->getUserRegistrations( foreach ($app['repo.registrations']->getUserRegistrations(
$app['authentication']->getUser(), $app['authentication']->getUser(),
$app['acl']->get($app['authentication']->getUser())->get_granted_base(['canadmin']) $app['acl']->get($app['authentication']->getUser())->get_granted_base(['canadmin'])
) as $registration) { ) as $registration) {
@@ -445,7 +445,7 @@ class Users implements ControllerProviderInterface
$app->abort(400, srpintf("User with id % in provided in 'deny' request variable could not be found", $usr)); $app->abort(400, srpintf("User with id % in provided in 'deny' request variable could not be found", $usr));
} }
$cacheToUpdate[$usr] = $user; $cacheToUpdate[$usr] = $user;
foreach ($app['manipulator.registration']->getRepository()->getUserRegistrations( foreach ($app['repo.registrations']->getUserRegistrations(
$user, $user,
array_map(function ($baseId) use ($app) { array_map(function ($baseId) use ($app) {
return \collection::get_from_base_id($app, $baseId); return \collection::get_from_base_id($app, $baseId);
@@ -461,7 +461,7 @@ class Users implements ControllerProviderInterface
$app->abort(400, srpintf("User with id % in provided in 'accept' request variable could not be found", $usr)); $app->abort(400, srpintf("User with id % in provided in 'accept' request variable could not be found", $usr));
} }
$cacheToUpdate[$usr] = $user; $cacheToUpdate[$usr] = $user;
foreach ($app['manipulator.registration']->getRepository()->getUserRegistrations( foreach ($app['repo.registrations']->getUserRegistrations(
$user, $user,
array_map(function ($baseId) use ($app) { array_map(function ($baseId) use ($app) {
return \collection::get_from_base_id($app, $baseId); return \collection::get_from_base_id($app, $baseId);

4
lib/Alchemy/Phrasea/Controller/Client/Baskets.php
View File

@@ -167,7 +167,7 @@ class Baskets implements ControllerProviderInterface
public function getBaskets(Application $app, Request $request) public function getBaskets(Application $app, Request $request)
{ {
$selectedBasketId = trim($request->get('courChuId', '')); $selectedBasketId = trim($request->get('courChuId', ''));
$baskets = new ArrayCollection($app['EM']->getRepository('Phraseanet:Basket')->findActiveByUser($app['authentication']->getUser())); $baskets = new ArrayCollection($app['repo.baskets']->findActiveByUser($app['authentication']->getUser()));
$selectedBasket = null; $selectedBasket = null;
if ('' === $selectedBasketId && $baskets->count() > 0) { if ('' === $selectedBasketId && $baskets->count() > 0) {
@@ -202,7 +202,7 @@ class Baskets implements ControllerProviderInterface
public function checkBaskets(Application $app, Request $request) public function checkBaskets(Application $app, Request $request)
{ {
$noview = 0; $noview = 0;
$repository = $app['EM']->getRepository('Phraseanet:Basket'); $repository = $app['repo.baskets'];
/* @var $repository Alchemy\Phrasea\Model\Repositories\BasketRepository */ /* @var $repository Alchemy\Phrasea\Model\Repositories\BasketRepository */
$baskets = $repository->findActiveByUser($app['authentication']->getUser()); $baskets = $repository->findActiveByUser($app['authentication']->getUser());

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

@@ -76,7 +76,7 @@ class Lightbox implements ControllerProviderInterface
return $app->redirectPath('logout'); return $app->redirectPath('logout');
} }
$repository = $app['EM']->getRepository('Phraseanet:Basket'); $repository = $app['repo.baskets'];
$basket_collection = array_merge( $basket_collection = array_merge(
$repository->findActiveByUser($app['authentication']->getUser()) $repository->findActiveByUser($app['authentication']->getUser())
@@ -209,7 +209,7 @@ class Lightbox implements ControllerProviderInterface
return $app->redirectPath('logout'); return $app->redirectPath('logout');
} }
$repository = $app['EM']->getRepository('Phraseanet:Basket'); $repository = $app['repo.baskets'];
$basket_collection = $repository->findActiveValidationAndBasketByUser( $basket_collection = $repository->findActiveValidationAndBasketByUser(
$app['authentication']->getUser() $app['authentication']->getUser()
@@ -256,7 +256,7 @@ class Lightbox implements ControllerProviderInterface
return $app->redirectPath('logout'); return $app->redirectPath('logout');
} }
$repository = $app['EM']->getRepository('Phraseanet:Basket'); $repository = $app['repo.baskets'];
$basket_collection = $repository->findActiveValidationAndBasketByUser( $basket_collection = $repository->findActiveValidationAndBasketByUser(
$app['authentication']->getUser() $app['authentication']->getUser()

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

@@ -80,7 +80,7 @@ class WorkZone implements ControllerProviderInterface
{ {
$request = $app['request']; $request = $app['request'];
$BasketRepo = $app['EM']->getRepository('Phraseanet:Basket'); $BasketRepo = $app['repo.baskets'];
$Page = (int) $request->query->get('Page', 0); $Page = (int) $request->query->get('Page', 0);

2
lib/Alchemy/Phrasea/Controller/Root/Login.php
View File

@@ -1032,7 +1032,7 @@ class Login implements ControllerProviderInterface
if (!$user->isGuest() && $request->cookies->has('invite-usr_id')) { if (!$user->isGuest() && $request->cookies->has('invite-usr_id')) {
if ($user->getId() != $inviteUsrId = $request->cookies->get('invite-usr_id')) { if ($user->getId() != $inviteUsrId = $request->cookies->get('invite-usr_id')) {
$repo = $app['EM']->getRepository('Phraseanet:Basket'); $repo = $app['repo.baskets'];
$baskets = $repo->findBy(['usr_id' => $inviteUsrId]); $baskets = $repo->findBy(['usr_id' => $inviteUsrId]);
foreach ($baskets as $basket) { foreach ($baskets as $basket) {

2
lib/Alchemy/Phrasea/Controller/Root/Session.php
View File

@@ -102,7 +102,7 @@ class Session implements ControllerProviderInterface
'notifications' => $app['events-manager']->get_notifications() 'notifications' => $app['events-manager']->get_notifications()
]); ]);
$baskets = $app['EM']->getRepository('Phraseanet:Basket')->findUnreadActiveByUser($app['authentication']->getUser()); $baskets = $app['repo.baskets']->findUnreadActiveByUser($app['authentication']->getUser());
foreach ($baskets as $basket) { foreach ($baskets as $basket) {
$ret['changed'][] = $basket->getId(); $ret['changed'][] = $basket->getId();

6
lib/Alchemy/Phrasea/Core/Provider/ORMServiceProvider.php
View File

@@ -190,6 +190,12 @@ class ORMServiceProvider implements ServiceProviderInterface
$app['repo.tasks'] = $app->share(function (PhraseaApplication $app) { $app['repo.tasks'] = $app->share(function (PhraseaApplication $app) {
return $app['EM']->getRepository('Phraseanet:Task'); return $app['EM']->getRepository('Phraseanet:Task');
}); });
$app['repo.registrations'] = $app->share(function (PhraseaApplication $app) {
return $app['EM']->getRepository('Phraseanet:Registration');
});
$app['repo.baskets'] = $app->share(function (PhraseaApplication $app) {
return $app['EM']->getRepository('Phraseanet:Basket');
});
} }
public function boot(Application $app) public function boot(Application $app)

2
lib/Alchemy/Phrasea/Core/Provider/RegistrationServiceProvider.php
View File

@@ -27,7 +27,7 @@ class RegistrationServiceProvider implements ServiceProviderInterface
}); });
$app['registration.manager'] = $app->share(function (Application $app) { $app['registration.manager'] = $app->share(function (Application $app) {
return new RegistrationManager($app['phraseanet.appbox'], $app['manipulator.registration']->getRepository(), $app['locale']); return new RegistrationManager($app['phraseanet.appbox'], $app['repo.registrations'], $app['locale']);
}); });
$app['registration.optional-fields'] = $app->share(function (Application $app) { $app['registration.optional-fields'] = $app->share(function (Application $app) {

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

@@ -33,7 +33,7 @@ class WorkZone extends Helper
public function getContent($sort) public function getContent($sort)
{ {
/* @var $repo_baskets Alchemy\Phrasea\Model\Repositories\BasketRepository */ /* @var $repo_baskets Alchemy\Phrasea\Model\Repositories\BasketRepository */
$repo_baskets = $this->app['EM']->getRepository('Phraseanet:Basket'); $repo_baskets = $this->app['repo.baskets'];
$sort = in_array($sort, ['date', 'name']) ? $sort : 'name'; $sort = in_array($sort, ['date', 'name']) ? $sort : 'name';

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

@@ -98,7 +98,7 @@ class eventsmanager_notify_orderdeliver extends eventsmanager_notifyAbstract
$receiver = Receiver::fromUser($user_to); $receiver = Receiver::fromUser($user_to);
$emitter = Emitter::fromUser($user_from); $emitter = Emitter::fromUser($user_from);
$repository = $this->app['EM']->getRepository('Phraseanet:Basket'); $repository = $this->app['repo.baskets'];
$basket = $repository->find($params['ssel_id']); $basket = $repository->find($params['ssel_id']);
$readyToSend = true; $readyToSend = true;
@@ -151,7 +151,7 @@ class eventsmanager_notify_orderdeliver extends eventsmanager_notifyAbstract
$sender = $user->getDisplayName(); $sender = $user->getDisplayName();
try { try {
$repository = $this->app['EM']->getRepository('Phraseanet:Basket'); $repository = $this->app['repo.baskets'];
$basket = $repository->findUserBasket($ssel_id, $this->app['authentication']->getUser(), false); $basket = $repository->findUserBasket($ssel_id, $this->app['authentication']->getUser(), false);
} catch (\Exception $e) { } catch (\Exception $e) {

2
lib/classes/eventsmanager/notify/push.php
View File

@@ -80,7 +80,7 @@ class eventsmanager_notify_push extends eventsmanager_notifyAbstract
$readyToSend = false; $readyToSend = false;
try { try {
$repository = $this->app['EM']->getRepository('Phraseanet:Basket'); $repository = $this->app['repo.baskets'];
$basket = $repository->find($params['ssel_id']); $basket = $repository->find($params['ssel_id']);
$user_from = $this->app['repo.users']->find($params['from']); $user_from = $this->app['repo.users']->find($params['from']);

2
lib/classes/eventsmanager/notify/validationdone.php
View File

@@ -138,7 +138,7 @@ class eventsmanager_notify_validationdone extends eventsmanager_notifyAbstract
$sender = $registered_user->getDisplayName(); $sender = $registered_user->getDisplayName();
try { try {
$repository = $this->app['EM']->getRepository('Phraseanet:Basket'); $repository = $this->app['repo.baskets'];
$basket = $repository->findUserBasket($ssel_id, $this->app['authentication']->getUser(), false); $basket = $repository->findUserBasket($ssel_id, $this->app['authentication']->getUser(), false);
} catch (\Exception $e) { } catch (\Exception $e) {

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

@@ -54,7 +54,7 @@ class set_export extends set_abstract
} }
if ($sstid != "") { if ($sstid != "") {
$repository = $app['EM']->getRepository('Phraseanet:Basket'); $repository = $app['repo.baskets'];
/* @var $repository Alchemy\Phrasea\Model\Repositories\BasketRepository */ /* @var $repository Alchemy\Phrasea\Model\Repositories\BasketRepository */
$Basket = $repository->findUserBasket($sstid, $app['authentication']->getUser(), false); $Basket = $repository->findUserBasket($sstid, $app['authentication']->getUser(), false);