Merge pull request #159 from UIUCLibrary/issue_157

fixes issue 157

Author: alexdryden

Module.php

@@ -37,6 +37,7 @@
 use Laminas\ServiceManager\ServiceLocatorInterface;
 use Laminas\View\Renderer\PhpRenderer;
 use Teams\Mvc\Controller\Plugin\TeamAuth;
+use function Symfony\Component\String\b;
 
 class Module extends AbstractModule
 {
@@ -200,6 +201,8 @@ public function handleConfigForm(AbstractController $controller)
         $globalSettings->set('teams_site_admin_make_site', $params['teams_site_admin_make_site']);
         $globalSettings->set('teams_editor_make_site', $params['teams_editor_make_site']);
         $globalSettings->set('teams_site_admin_make_user', $params['teams_site_admin_make_user']);
+        $globalSettings->set('teams_filter_bypass_roles', $params['teams_filter_bypass_roles']);
+
     }
 
     public function getConfigForm(PhpRenderer $renderer)
@@ -736,8 +739,15 @@ public function teamSelectorNav(Event $event)
 
     public function bypassTeamsSortSelector(Event $event)
     {
+        $globalSettings = $this->getServiceLocator()->get('Omeka\Settings');
+        $roles = $globalSettings->get('teams_filter_bypass_roles');
+
+        if (!is_array($roles)) {
+            $roles[] = $roles;
+        }
+
         $user = $this->getUser();
-        if ($user && $user->getRole() == 'global_admin'){
+        if ($user && in_array($user->getRole(),$roles) ){
             $view = $event->getTarget();
             $params = $view->params();
             $bypassTeams = $params->fromQuery('bypass_team_filter');
@@ -875,9 +885,15 @@ public function filterByTeam(Event $event)
         //TODO: if is set (search_everywhere) and ACL check passes as global admin, bypass the join
         //for times when the admin needs to turn off the filter by teams (e.g. when adding resources to a new team)
 
+        $globalSettings = $this->getServiceLocator()->get('Omeka\Settings');
+        $bypass_teams_filter_roles = $globalSettings->get('teams_filter_bypass_roles');
+
+        if (!is_array($bypass_teams_filter_roles)) {
+            $bypass_teams_filter_roles[] = $bypass_teams_filter_roles;
+        }
         if (isset($query['bypass_team_filter'])
             && $query['bypass_team_filter']
-            && $this->getUser()->getRole() == 'global_admin'
+            && in_array($this->getUser()->getRole(), $bypass_teams_filter_roles)
         ) {
             return;
         }

src/Form/ConfigForm.php

@@ -3,10 +3,15 @@
 
 namespace Teams\Form;
 
+use Omeka\Permissions\Acl;
 use Laminas\Form\Form;
 
 class ConfigForm extends Form
 {
+    /**
+     * @var Acl
+     */
+    protected $acl;
     protected $globalSettings;
 
     public function init()
@@ -46,9 +51,44 @@ public function init()
                 'id' => 'teams_site_admin_make_user',
             ],
         ]);
+        $roles = $this->getAcl()->getRoleLabels(false);
+
+        $this->add([
+                'name' => 'teams_filter_bypass_roles',
+                'type' => 'select',
+                'options' => [
+                    'label' => 'Grant "Bypass Teams Filter" ability', // @translate
+                    'info' =>'List of core Omeka S roles that can bypass the Teams filter on admin search interfaces',
+                    'value_options' => $roles,
+
+                ],
+                'attributes' => [
+                    'id' => 'role',
+                    'class' => 'chosen-select',
+                    'multiple' => true,
+                    'value' => $this->globalSettings->get('teams_filter_bypass_roles'),
+                ],
+            ]);
+
     }
     public function setGlobalSettings($globalSettings)
     {
         $this->globalSettings = $globalSettings;
     }
+
+    /**
+     * @param Acl $acl
+     */
+    public function setAcl(Acl $acl)
+    {
+        $this->acl = $acl;
+    }
+
+    /**
+     * @return Acl
+     */
+    public function getAcl()
+    {
+        return $this->acl;
+    }
 }

src/Form/TeamCompactForm.php

@@ -89,7 +89,8 @@ public function init()
         if ($this->getOption('include_role')) {
             $excludeAdminRoles = !$this->getOption('include_admin_roles');
             $roles = $this->getAcl()->getRoleLabels($excludeAdminRoles);
-            $this->get('user-information')->add([
+            $this->get('user-information')
+                ->add([
                 'name' => 'o:role',
                 'type' => 'select',
                 'options' => [

src/Service/Form/ConfigFormFactory.php

@@ -11,6 +11,7 @@ class ConfigFormFactory implements FactoryInterface
     public function __invoke(ContainerInterface $container, $requestedName, array $options = null)
     {
         $form = new ConfigForm();
+        $form->setAcl($container->get('Omeka\Acl'));
         $globalSettings = $container->get('Omeka\Settings');
         $form->setGlobalSettings($globalSettings);