From d7f1e3fa5361325b9e348e5050836cd9d7e28034 Mon Sep 17 00:00:00 2001
From: Daniel Berthereau <Daniel.github@Berthereau.net>
Date: Mon, 20 Oct 2014 02:47:03 +0200
Subject: [PATCH] Fixed list of roles that can override restrictions.

---
 HideElementsPlugin.php                        | 15 ++++++-
 .../plugins/hide-elements-config-form.php     | 41 +++++++++++--------
 2 files changed, 36 insertions(+), 20 deletions(-)
 rename config-form.php => views/admin/plugins/hide-elements-config-form.php (72%)

diff --git a/HideElementsPlugin.php b/HideElementsPlugin.php
index bff5b71..59b898f 100644
--- a/HideElementsPlugin.php
+++ b/HideElementsPlugin.php
@@ -65,8 +65,13 @@ public function hookInitialize()
         }
     }
 
-    public function hookConfigForm()
+    /**
+     * Shows plugin configuration page.
+     */
+    public function hookConfigForm($args)
     {
+        $view = $args['view'];
+
         $settings = $this->_settings;
 
         $table = get_db()->getTable('Element');
@@ -76,7 +81,13 @@ public function hookConfigForm()
             ->order('elements.order');
 
         $elements = $table->fetchObjects($select);
-        include 'config-form.php';
+        echo $view->partial(
+            'plugins/hide-elements-config-form.php',
+            array(
+                'view' => $view,
+                'settings' => $settings,
+                'elements' => $elements,
+        ));
     }
 
     public function hookConfig($args)
diff --git a/config-form.php b/views/admin/plugins/hide-elements-config-form.php
similarity index 72%
rename from config-form.php
rename to views/admin/plugins/hide-elements-config-form.php
index efcc11f..005e004 100644
--- a/config-form.php
+++ b/views/admin/plugins/hide-elements-config-form.php
@@ -1,30 +1,35 @@
-<?php $view = get_view(); ?>
 <style type="text/css">
 .hide-boxes {
     text-align: center;
 }
+.input-block ul {
+    list-style: none outside none;
+}
 </style>
 <div class="field">
     <div class="two columns alpha">
-        <label for="collection_tree_parent_collection_id"><?php echo __('Override visibility restrictions by role'); ?></label>
+        <label for="override-restrictions"><?php echo __('Override visibility restrictions by role'); ?></label>
     </div>
     <div class="inputs five columns omega">
-        <?php echo $view->formCheckbox('override[]', 'super', array(
-            'disableHidden' => true,
-            'checked' => in_array('super', $settings['override']),
-        )); ?> <?php echo __('Super'); ?><br>
-        <?php echo $view->formCheckbox('override[]', 'admin', array(
-            'disableHidden' => true,
-            'checked' => in_array('admin', $settings['override']),
-        )); ?> <?php echo __('Admin'); ?><br>
-        <?php echo $view->formCheckbox('override[]', 'researcher', array(
-            'disableHidden' => true,
-            'checked' => in_array('researcher', $settings['override']),
-        )); ?> <?php echo __('Researcher'); ?><br>
-        <?php echo $view->formCheckbox('override[]', 'contributor', array(
-            'disableHidden' => true,
-            'checked' => in_array('contributor', $settings['override']),
-        )); ?> <?php echo __('Contributor'); ?> 
+        <div class="input-block">
+            <ul>
+                <?php
+                $userRoles = get_user_roles();
+                foreach ($userRoles as $role => $label) {
+                    echo '<li>';
+                    echo $view->formCheckbox('override[]', $role, array(
+                        'disableHidden' => true,
+                        'checked' => in_array($role, $settings['override']),
+                    ));
+                    echo ' ' . $label;
+                    echo '</li>';
+                }
+                ?>
+            </ul>
+        </div>
+        <p class="explanation">
+            <?php echo __("Note: Full text indexation can't be overridden because the same field is used for all users."); ?>
+        </p>
     </div>
 </div>
 <table id="hide-elements-table">