From e68081399d921d70f532a8be42a821ebba00f5ab Mon Sep 17 00:00:00 2001 From: aina-esokia Date: Tue, 2 Apr 2019 15:36:49 +0400 Subject: [PATCH] port add model in order manager of collection --- lib/Alchemy/Phrasea/Collection/CollectionService.php | 4 +++- lib/Alchemy/Phrasea/Controller/Admin/CollectionController.php | 1 + lib/Alchemy/Phrasea/Controller/Admin/UserController.php | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/Alchemy/Phrasea/Collection/CollectionService.php b/lib/Alchemy/Phrasea/Collection/CollectionService.php index acc1db6772..48ccbac843 100644 --- a/lib/Alchemy/Phrasea/Collection/CollectionService.php +++ b/lib/Alchemy/Phrasea/Collection/CollectionService.php @@ -319,7 +319,9 @@ class CollectionService $result = $userQuery->on_base_ids([ $reference->getBaseId()] ) ->who_have_right([\ACL::ORDER_MASTER]) - ->execute()->get_results(); + ->include_templates(true) + ->execute() + ->get_results(); /** @var ACLProvider $acl */ $acl = $this->app['acl']; diff --git a/lib/Alchemy/Phrasea/Controller/Admin/CollectionController.php b/lib/Alchemy/Phrasea/Controller/Admin/CollectionController.php index 3304a19de8..271e7a49df 100644 --- a/lib/Alchemy/Phrasea/Controller/Admin/CollectionController.php +++ b/lib/Alchemy/Phrasea/Controller/Admin/CollectionController.php @@ -50,6 +50,7 @@ class CollectionController extends Controller $query = $this->createUserQuery(); $admins = $query->on_base_ids([$bas_id]) ->who_have_right([\ACL::ORDER_MASTER]) + ->include_templates(true) ->execute() ->get_results(); } diff --git a/lib/Alchemy/Phrasea/Controller/Admin/UserController.php b/lib/Alchemy/Phrasea/Controller/Admin/UserController.php index 65da919edd..35ff646b8c 100644 --- a/lib/Alchemy/Phrasea/Controller/Admin/UserController.php +++ b/lib/Alchemy/Phrasea/Controller/Admin/UserController.php @@ -233,6 +233,7 @@ class UserController extends Controller ->who_have_right($have_right) ->who_have_not_right($have_not_right) ->on_base_ids($on_base) + ->include_templates(true) ->execute() ->get_results();