fix(ui): pqselect enabled not loaded every time it is needed (#768)

pluginsGLPI · Oct 13, 2017 · 22f3508 · 22f3508
1 parent ec40d9f
commit 22f3508
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 13 deletions.
diff --git a/inc/form.class.php b/inc/form.class.php
@@ -451,7 +451,6 @@ public function showForm($ID, $options=[]) {
                      document.getElementById("validators_users").style.display  = "none";
                      document.getElementById("validators_groups").style.display = "none";
                   }
-                  fcInitMultiSelect();
                }
                $(document).ready(function() {changeValidators(' . $this->fields["validation_required"] . ');});';
       echo Html::scriptBlock($script);

diff --git a/js/scripts.js.php b/js/scripts.js.php
@@ -135,21 +135,24 @@ function (response) {
       $('.plugin_formcreator_sort input[value=mostPopularSort]')[0].checked = true;
    }
 
-   fcInitMultiSelect();
-});
-
-function fcInitMultiSelect() {
    // === Add better multi-select on form configuration validators ===
    // initialize the pqSelect widget.
+      fcInitMultiSelect();
+
    $('#tabspanel + div.ui-tabs').on("tabsload", function( event, ui ) {
-      $("#validator_users").pqSelect({
-          multiplePlaceholder: '----',
-          checkbox: true //adds checkbox to options
-      });
-      $("#validator_groups").pqSelect({
-          multiplePlaceholder: '----',
-          checkbox: true //adds checkbox to options
-      });
+      fcInitMultiSelect();
+   });
+
+});
+
+function fcInitMultiSelect() {
+   $("#validator_users").pqSelect({
+       multiplePlaceholder: '----',
+       checkbox: true //adds checkbox to options
+   });
+   $("#validator_groups").pqSelect({
+       multiplePlaceholder: '----',
+       checkbox: true //adds checkbox to options
    });
 }