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

Merge pull request #2966 from aynsix/PHRAS-2499-add-model-order-manager

Browse Source 
PHRAS-2499: Port to 4.1 - Add Model to "Order Managers" of collection
This commit is contained in:
Nicolas Maillat
2019-04-02 14:20:22 +02:00
committed by GitHub
parent 141bfde9ca e68081399d
commit d2e09dbdf7
3 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/Alchemy/Phrasea/Collection/CollectionService.php
View File

@@ -319,7 +319,9 @@ class CollectionService
$result = $userQuery->on_base_ids([ $reference->getBaseId()] ) $result = $userQuery->on_base_ids([ $reference->getBaseId()] )
->who_have_right([\ACL::ORDER_MASTER]) ->who_have_right([\ACL::ORDER_MASTER])
->execute()->get_results(); ->include_templates(true)
->execute()
->get_results();
/** @var ACLProvider $acl */ /** @var ACLProvider $acl */
$acl = $this->app['acl']; $acl = $this->app['acl'];

1
lib/Alchemy/Phrasea/Controller/Admin/CollectionController.php
View File

@@ -50,6 +50,7 @@ class CollectionController extends Controller
$query = $this->createUserQuery(); $query = $this->createUserQuery();
$admins = $query->on_base_ids([$bas_id]) $admins = $query->on_base_ids([$bas_id])
->who_have_right([\ACL::ORDER_MASTER]) ->who_have_right([\ACL::ORDER_MASTER])
->include_templates(true)
->execute() ->execute()
->get_results(); ->get_results();
} }

1
lib/Alchemy/Phrasea/Controller/Admin/UserController.php
View File

@@ -233,6 +233,7 @@ class UserController extends Controller
->who_have_right($have_right) ->who_have_right($have_right)
->who_have_not_right($have_not_right) ->who_have_not_right($have_not_right)
->on_base_ids($on_base) ->on_base_ids($on_base)
->include_templates(true)
->execute() ->execute()
->get_results(); ->get_results();