Skip to content

Commit 7221644

Browse files
committed
fix(form): repair massive acions
1 parent 02c2877 commit 7221644

File tree

2 files changed

+13
-8
lines changed

2 files changed

+13
-8
lines changed

inc/form.class.php

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ public function getSearchOptionsNew() {
132132
'searchtype' => [
133133
'0' => 'equals'
134134
],
135-
'massiveaction' => false
135+
'massiveaction' => true
136136
];
137137

138138
$tab[] = [
@@ -207,29 +207,30 @@ public static function getSpecificValueToSelect($field, $name='', $values='', ar
207207

208208
switch ($field) {
209209
case 'is_active' :
210-
return Dropdown::showFromArray('criteria[0][value]', [
210+
return Dropdown::showFromArray($name, [
211211
'0' => __('Inactive'),
212212
'1' => __('Active'),
213213
], [
214214
'value' => $values[$field],
215-
'display_emptychoice' => true,
215+
'display_emptychoice' => false,
216216
'display' => false
217217
]);
218218
break;
219+
219220
case 'access_rights' :
220-
return Dropdown::showFromArray('criteria[0][value]', [
221-
Dropdown::EMPTY_VALUE => '--- ' . __('All langages', 'formcreator') . ' ---',
221+
return Dropdown::showFromArray($name, [
222222
self::ACCESS_PUBLIC => __('Public access', 'formcreator'),
223223
self::ACCESS_PRIVATE => __('Private access', 'formcreator'),
224224
self::ACCESS_RESTRICTED => __('Restricted access', 'formcreator'),
225225
], [
226226
'value' => $values[$field],
227-
'display_emptychoice' => true,
227+
'display_emptychoice' => false,
228228
'display' => false
229229
]);
230230
break;
231+
231232
case 'language' :
232-
return Dropdown::showLanguages('criteria[0][value]', [
233+
return Dropdown::showLanguages($name, [
233234
'value' => $values[$field],
234235
'display_emptychoice' => true,
235236
'emptylabel' => '--- ' . __('All langages', 'formcreator') . ' ---',
@@ -269,20 +270,24 @@ public static function getSpecificValueToDisplay($field, $values, array $options
269270
}
270271
return $output;
271272
break;
273+
272274
case 'access_rights':
273275
switch ($values[$field]) {
274276
case self::ACCESS_PUBLIC :
275277
return __('Public access', 'formcreator');
276278
break;
279+
277280
case self::ACCESS_PRIVATE :
278281
return __('Private access', 'formcreator');
279282
break;
283+
280284
case self::ACCESS_RESTRICTED :
281285
return __('Restricted access', 'formcreator');
282286
break;
283287
}
284288
return '';
285289
break;
290+
286291
case 'language' :
287292
if (empty($values[$field])) {
288293
return __('All langages', 'formcreator');

js/scripts.js.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
?>
55

66
var modalWindow;
7-
var rootDoc = "<?php echo $CFG_GLPI['root_doc']; ?>";
7+
var rootDoc = CFG_GLPI['root_doc'];
88
var currentCategory = "0";
99
var sortByName = false;
1010
var tiles = [];

0 commit comments

Comments
 (0)