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

Move user search in push controller

Browse Source
This commit is contained in:
Romain Neutron
2012-01-12 15:31:28 +01:00
parent bf4d67872a
commit 694b3b04e6
1 changed files with 155 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
lib/Alchemy/Phrasea/Controller/Prod/Push.php
View File

@@ -107,7 +107,7 @@ class Push implements ControllerProviderInterface
$BasketElement->setBasket($Basket); $BasketElement->setBasket($Basket);
if($receiver['HD']) if ($receiver['HD'])
{ {
$user_receiver->ACL()->grant_hd_on( $user_receiver->ACL()->grant_hd_on(
$BasketElement->getRecord() $BasketElement->getRecord()
@@ -237,7 +237,7 @@ class Push implements ControllerProviderInterface
{ {
$participant_user = \User_Adapter::getInstance($participant['usr_id'], $appbox); $participant_user = \User_Adapter::getInstance($participant['usr_id'], $appbox);
} }
catch(\Exception $e) catch (\Exception $e)
{ {
throw new ControllerException(sprintf(_('Unknown user %d'), $receiver['usr_id'])); throw new ControllerException(sprintf(_('Unknown user %d'), $receiver['usr_id']));
} }
@@ -268,7 +268,7 @@ class Push implements ControllerProviderInterface
$validationData->setBasketElement($BasketElement); $validationData->setBasketElement($BasketElement);
$BasketElement->addValidationData($ValidationData); $BasketElement->addValidationData($ValidationData);
if($participant['HD']) if ($participant['HD'])
{ {
$participant_user->ACL()->grant_hd_on( $participant_user->ACL()->grant_hd_on(
$BasketElement->getRecord() $BasketElement->getRecord()
@@ -327,9 +327,18 @@ class Push implements ControllerProviderInterface
$em = $app['Core']->getEntityManager(); $em = $app['Core']->getEntityManager();
$user = $app['Core']->getAuthenticatedUser(); $user = $app['Core']->getAuthenticatedUser();
$pusher = new RecordHelper\Push($app['Core'], $app['request']); $query = new \User_Query(\appbox::get_instance());
$result = $pusher->search($request->get('query')); $query->on_bases_where_i_am($user->ACL(), array('canpush'));
$query->like(\User_Query::LIKE_FIRSTNAME, $request->get('query'))
->like(\User_Query::LIKE_LASTNAME, $request->get('query'))
->like(\User_Query::LIKE_LOGIN, $request->get('query'))
->like_match(\User_Query::LIKE_MATCH_OR);
$result = $query->include_phantoms()
->limit(0, 50)
->execute()->get_results();
$repository = $em->getRepository('\Entities\UsrList'); $repository = $em->getRepository('\Entities\UsrList');
@@ -337,6 +346,8 @@ class Push implements ControllerProviderInterface
$datas = array(); $datas = array();
if ($lists)
{
foreach ($lists as $list) foreach ($lists as $list)
{ {
$datas[] = array( $datas[] = array(
@@ -345,7 +356,10 @@ class Push implements ControllerProviderInterface
, 'quantity' => $list->getUsers()->count() , 'quantity' => $list->getUsers()->count()
); );
} }
}
if ($result)
{
foreach ($result as $user) foreach ($result as $user)
{ {
$datas[] = array( $datas[] = array(
@@ -357,6 +371,7 @@ class Push implements ControllerProviderInterface
, 'display_name' => $user->get_display_name() , 'display_name' => $user->get_display_name()
); );
} }
}
$Json = $app['Core']['Serializer']->serialize($datas, 'json'); $Json = $app['Core']['Serializer']->serialize($datas, 'json');