fix(form): repair massive acions

pluginsGLPI · Oct 18, 2017 · 7221644 · 7221644
1 parent 02c2877
commit 7221644
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 8 deletions.
diff --git a/inc/form.class.php b/inc/form.class.php
@@ -132,7 +132,7 @@ public function getSearchOptionsNew() {
          'searchtype'         => [
             '0'                  => 'equals'
          ],
-         'massiveaction'      => false
+         'massiveaction'      => true
       ];
 
       $tab[] = [
@@ -207,29 +207,30 @@ public static function getSpecificValueToSelect($field, $name='', $values='', ar
 
       switch ($field) {
          case 'is_active' :
-            return Dropdown::showFromArray('criteria[0][value]', [
+            return Dropdown::showFromArray($name, [
                '0' => __('Inactive'),
                '1' => __('Active'),
             ], [
                'value'               => $values[$field],
-               'display_emptychoice' => true,
+               'display_emptychoice' => false,
                'display'             => false
             ]);
             break;
+
          case 'access_rights' :
-            return Dropdown::showFromArray('criteria[0][value]', [
-               Dropdown::EMPTY_VALUE => '--- ' . __('All langages', 'formcreator') . ' ---',
+            return Dropdown::showFromArray($name, [
                self::ACCESS_PUBLIC => __('Public access', 'formcreator'),
                self::ACCESS_PRIVATE => __('Private access', 'formcreator'),
                self::ACCESS_RESTRICTED => __('Restricted access', 'formcreator'),
             ], [
                'value'               => $values[$field],
-               'display_emptychoice' => true,
+               'display_emptychoice' => false,
                'display'             => false
             ]);
             break;
+
          case 'language' :
-            return Dropdown::showLanguages('criteria[0][value]', [
+            return Dropdown::showLanguages($name, [
                'value'               => $values[$field],
                'display_emptychoice' => true,
                'emptylabel'          => '--- ' . __('All langages', 'formcreator') . ' ---',
@@ -269,20 +270,24 @@ public static function getSpecificValueToDisplay($field, $values, array $options
             }
             return $output;
             break;
+
          case 'access_rights':
             switch ($values[$field]) {
                case self::ACCESS_PUBLIC :
                   return __('Public access', 'formcreator');
                   break;
+
                case self::ACCESS_PRIVATE :
                   return __('Private access', 'formcreator');
                   break;
+
                case self::ACCESS_RESTRICTED :
                   return __('Restricted access', 'formcreator');
                   break;
             }
             return '';
             break;
+
          case 'language' :
             if (empty($values[$field])) {
                return __('All langages', 'formcreator');

diff --git a/js/scripts.js.php b/js/scripts.js.php
@@ -4,7 +4,7 @@
 ?>
 
 var modalWindow;
-var rootDoc          = "<?php echo $CFG_GLPI['root_doc']; ?>";
+var rootDoc          = CFG_GLPI['root_doc'];
 var currentCategory  = "0";
 var sortByName = false;
 var tiles = [];