feat(dropdownfield,glpiselectfield): choose if subtree root is select…

…able Signed-off-by: Thierry Bugier <tbugier@teclib.com>
pluginsGLPI · Jun 11, 2021 · 164e752 · 164e752
1 parent 6773e29
commit 164e752
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 3 deletions.
diff --git a/ajax/commontree.php b/ajax/commontree.php
@@ -37,9 +37,10 @@
 }
 
 // Load parameters
-$itemtype = $_GET['itemtype'];
-$root     = $_GET['root'];
-$depth    = $_GET['maxDepth'];
+$itemtype       = $_GET['itemtype'];
+$root           = $_GET['root'];
+$depth          = $_GET['maxDepth'];
+$selectableRoot = $_GET['selectableRoot'];
 
 // This should only be used for dropdowns
 if (!is_a($itemtype, CommonTreeDropdown::class, true)) {
@@ -53,6 +54,10 @@
 $additions .= '<label for="dropdown_show_tree_root'.$rand.'" id="label_show_tree_root">';
 $additions .= __('Subtree root', 'formcreator');
 $additions .= '</label>';
+$additions .= '<br>';
+$additions .= '<label for="dropdown_selectable_tree_root'.$rand.'" id="label_selectable_tree_root">';
+$additions .= __('Selectable', 'formcreator');
+$additions .= '</label>';
 $additions .= '</td>';
 $additions .= '<td>';
 $additions .= Dropdown::show($itemtype, [
@@ -61,6 +66,8 @@
    'rand'  => $rand,
    'display' => false,
 ]);
+$additions .= '<br>';
+$additions .= Dropdown::showYesNo('selectable_tree_root', $selectableRoot, -1, ['display' => false]);
 $additions .= '</td>';
 $additions .= '<td>';
 $additions .= '<label for="dropdown_show_tree_depth'.$rand.'" id="label_show_tree_depth">';

diff --git a/inc/field/dropdownfield.class.php b/inc/field/dropdownfield.class.php
@@ -76,6 +76,7 @@ public function getDesignSpecializationField(): array {
 
       $root = $decodedValues['show_tree_root'] ?? Dropdown::EMPTY_VALUE;
       $maxDepth = $decodedValues['show_tree_depth'] ?? Dropdown::EMPTY_VALUE;
+      $selectableRoot = $decodedValues['selectable_tree_root'] ?? '0';
 
       $optgroup = Dropdown::getStandardDropdownItemTypes();
 
@@ -136,6 +137,7 @@ public function getDesignSpecializationField(): array {
       $additions .= '<td>';
       $additions .= "<input id='commonTreeDropdownRoot' type='hidden' value='$root'>";
       $additions .= "<input id='commonTreeDropdownMaxDepth' type='hidden' value='$maxDepth'>";
+      $additions .= "<input id='commonTreeDropdownSelectableRoot' type='hidden' value='$selectableRoot'>";
       $additions .= '</td>';
       $additions .= '<td>';
       $additions .= '</td>';
@@ -308,11 +310,16 @@ public function buildParams($rand = null) {
             $itemtype::getTable(),
             $decodedValues['show_ticket_categories_root']
          );
+         if (!isset($decodedValues['selectable_tree_root']) || $decodedValues['selectable_tree_root'] == '0') {
+            unset($sons[$decodedValues['show_tree_root']]);
+         }
+
          $dparams_cond_crit[$itemtype::getTable() . '.id'] = $sons;
          $rootItem = new $itemtype();
          if ($rootItem->getFromDB($decodedValues['show_ticket_categories_root'])) {
             $baseLevel = $rootItem->fields['level'];
          }
+
       }
 
       // Apply max depth if defined (CommonTreeDropdown)
@@ -518,6 +525,7 @@ public function prepareQuestionInputForSave($input) {
          // Set default for depth setting
          $input['values']['show_tree_depth'] = (string) (int) ($input['show_tree_depth'] ?? '-1');
          $input['values']['show_tree_root'] = ($input['show_tree_root'] ?? '');
+         $input['values']['selectable_tree_root'] = ($input['selectable_tree_root'] ?? '0');
       } else if ($input['dropdown_values'] == SLA::getType()
          || $input['dropdown_values'] == OLA::getType()
       ) {
@@ -532,6 +540,7 @@ public function prepareQuestionInputForSave($input) {
       unset($input['show_ticket_categories']);
       unset($input['show_tree_depth']);
       unset($input['show_tree_root']);
+      unset($input['selectable_tree_root']);
       unset($input['dropdown_values']);
 
       return $input;

diff --git a/inc/field/glpiselectfield.class.php b/inc/field/glpiselectfield.class.php
@@ -97,6 +97,7 @@ public function getDesignSpecializationField(): array {
 
       $root = $decodedValues['show_tree_root'] ?? '0';
       $maxDepth = $decodedValues['show_tree_depth'] ?? Dropdown::EMPTY_VALUE;
+      $selectableRoot = $decodedValues['selectable_tree_root'] ?? '0';
 
       $additions = '<tr class="plugin_formcreator_question_specific">';
       $additions .= '<td>';
@@ -109,6 +110,7 @@ public function getDesignSpecializationField(): array {
       $additions .= '<td>';
       $additions .= "<input id='commonTreeDropdownRoot' type='hidden' value='$root'>";
       $additions .= "<input id='commonTreeDropdownMaxDepth' type='hidden' value='$maxDepth'>";
+      $additions .= "<input id='commonTreeDropdownSelectableRoot' type='hidden' value='$selectableRoot'>";
       $additions .= '</td>';
       $additions .= '<td>';
       $additions .= '</td>';
@@ -162,13 +164,15 @@ public function prepareQuestionInputForSave($input) {
          // Set default for depth setting
          $input['values']['show_tree_depth'] = (int) ($input['show_tree_depth'] ?? '-1');
          $input['values']['show_tree_root'] = ($input['show_tree_root'] ?? '');
+         $input['values']['selectable_tree_root'] = ($input['selectable_tree_root'] ?? '0');
       }
 
       $input['values'] = json_encode($input['values']);
 
       unset($input['dropdown_default_value']);
       unset($input['show_tree_root']);
       unset($input['show_tree_depth']);
+      unset($input['selectable_tree_root']);
 
       return $input;
    }

diff --git a/js/scripts.js.php b/js/scripts.js.php
@@ -1467,6 +1467,7 @@ function plugin_formcreator_changeDropdownItemtype(rand) {
             itemtype: dropdown_type,
             root: $("#commonTreeDropdownRoot").val(),
             maxDepth: $("#commonTreeDropdownMaxDepth").val(),
+            selectableRoot: $("#commonTreeDropdownSelectableRoot").val(),
          },
       }).done(function(response) {
          $('.plugin_formcreator_dropdown').html(response);
@@ -1500,6 +1501,7 @@ function plugin_formcreator_changeGlpiObjectItemType() {
          itemtype: glpi_object,
          root: $("#commonTreeDropdownRoot").val(),
          maxDepth: $("#commonTreeDropdownMaxDepth").val(),
+         selectableRoot: $("#commonTreeDropdownSelectableRoot").val(),
       },
    }).done(function(response) {
       $('.plugin_formcreator_dropdown').html(response);