fix(targetticket): last valid category ignored visibility state

Signed-off-by: Thierry Bugier <tbugier@teclib.com>
pluginsGLPI · Jul 30, 2020 · f6e09f0 · f6e09f0
1 parent 24dacd2
commit f6e09f0
Show file tree

Hide file tree

Showing 5 changed files with 225 additions and 124 deletions.
diff --git a/inc/fields.class.php b/inc/fields.class.php
@@ -112,7 +112,8 @@ public static function getNames() {
    }
 
    /**
-    * Reset the cache of visibility of hide-able items
+    * Reset cache of evaluated visibility
+    * used for unit tests
     *
     * @return void
     */

diff --git a/inc/fields/dropdownfield.class.php b/inc/fields/dropdownfield.class.php
@@ -385,9 +385,15 @@ public function prepareQuestionInputForSave($input) {
          if (is_a($input['dropdown_values'], "CommonTreeDropdown", true)) {
             // Specific param for ITILCategory
             if ($input['dropdown_values'] == ITILCategory::class) {
+               if (!isset($input['show_ticket_categories'])) {
+                  $input['show_ticket_categories'] = 'all';
+               }
                $input['values']['show_ticket_categories'] = $input['show_ticket_categories'];
             }
 
+            if (!isset($input['show_ticket_categories_depth'])) {
+               $input['show_ticket_categories_depth'] = 0;
+            }
             if ($input['show_ticket_categories_depth'] != (int) $input['show_ticket_categories_depth']) {
                $input['values']['show_ticket_categories_depth'] = 0;
             } else {

diff --git a/inc/form.class.php b/inc/form.class.php
@@ -2171,7 +2171,7 @@ public function getFromDBByQuestion(PluginFormcreatorQuestion $question) {
    /**
     * Get an array of instances of all fields for the form
     *
-    * @return array
+    * @return PluginFormcreatorFields[]
     */
    public function getFields() {
       $fields = [];

diff --git a/inc/targetbase.class.php b/inc/targetbase.class.php
@@ -377,10 +377,10 @@ protected function setTargetEntity($data, PluginFormcreatorFormAnswer $formanswe
       return $data;
    }
 
-   protected function setTargetCategory($data, $formanswer) {
+   protected function setTargetCategory($data, PluginFormcreatorFormAnswer $formanswer) {
       global $DB;
 
-      $category = null;
+      $category = 0;
 
       switch ($this->fields['category_rule']) {
          case self::CATEGORY_RULE_ANSWER:
@@ -398,54 +398,53 @@ protected function setTargetCategory($data, $formanswer) {
             $category = $this->fields['category_question'];
             break;
          case self::CATEGORY_RULE_LAST_ANSWER:
-            $form_id = $formanswer->fields['id'];
-
-            // Get all answers for dropdown questions of this form, ordered
-            // from last to first displayed
-            $answers = $DB->request([
-               'SELECT' => ['answer.answer', 'question.values'],
-               'FROM' => PluginFormcreatorAnswer::getTable() . ' AS answer',
-               'JOIN' => [
-                  PluginFormcreatorQuestion::getTable() . ' AS question' => [
-                     'ON' => [
-                        'answer' => 'plugin_formcreator_questions_id',
-                        'question' => 'id',
-                     ]
-                  ]
-               ],
-               'WHERE' => [
-                  'answer.plugin_formcreator_formanswers_id' => $form_id,
-                  'question.fieldtype'                       => "dropdown",
-               ],
-               'ORDER' => [
-                  'row DESC',
-                  'col DESC',
-               ]
-            ]);
+            $questionFields = $formanswer->getForm()->getFields();
+            $answers_values = $formanswer->getAnswers($formanswer->getID());
+            foreach ($questionFields as $id => $question) {
+               $questionFields[$id]->deserializeValue($answers_values['formcreator_field_' . $id]);
+            }
+
+            // filter questions; keep DropdownFields only
+            $filteredFields = array_filter($questionFields, function($item) {
+               return get_class($item) === PluginFormcreatorDropdownField::class;
+            });
+
+            // Sort question in reverse order
+            uasort($filteredFields, function($a, $b) {
+               $orderA = $a->getQuestion()->fields['order'];
+               $orderB = $b->getQuestion()->fields['order'];
+               if ($orderA == $orderB) {
+                  return 0;
+               }
+               return ($orderA > $orderB) ? -1 : 1;
+            });
 
-            foreach ($answers as $answer) {
+            foreach ($filteredFields as $questionField) {
                // Decode dropdown settings
-               $itemtype = \PluginFormcreatorDropdownField::getSubItemtypeForValues($answer['values']);
+               $itemtype = \PluginFormcreatorDropdownField::getSubItemtypeForValues($questionField->getQuestion()->fields['values']);
 
                // Skip if not a dropdown on categories
-               if ($itemtype !== "ITILCategory") {
+               if ($itemtype !== ITILCategory::class) {
+                  continue;
+               }
+
+               // Skip if question is invisible
+               if (!PluginFormcreatorFields::isVisible($questionField->getQuestion(), $questionFields)) {
                   continue;
                }
 
                // Skip if question was not answered
-               if (empty($answer['answer'])) {
+               if (empty($questionField->getValueForDesign())) {
                   continue;
                }
 
                // Found a valid answer, stop here
-               $category = $answer['answer'];
+               $category = $questionField->getValueForDesign();
                break;
             }
             break;
       }
-      if ($category !== null) {
-         $data['itilcategories_id'] = $category;
-      }
+      $data['itilcategories_id'] = $category;
 
       return $data;
    }