refactor(formanswer): optimize target visibility computation

Signed-off-by: Thierry Bugier <tbugier@teclib.com>
pluginsGLPI · May 7, 2020 · 9a511cd · 9a511cd
1 parent 71cddf3
commit 9a511cd
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/inc/formanswer.class.php b/inc/formanswer.class.php
@@ -936,17 +936,18 @@ public function generateTarget() {
 
       $CFG_GLPI['plugin_formcreator_disable_hook_create_ticket'] = '1';
 
+      // get all fields to compute visibility of targets
+      $this->questionFields = $form->getFields();
+      $answers_values = $this->getAnswers($this->getID());
+      foreach ($this->questionFields as $id => $field) {
+         $this->questionFields[$id]->deserializeValue($answers_values['formcreator_field_' . $id]);
+      }
+
       // Generate targets
       $generatedTargets = new PluginFormcreatorComposite(new PluginFormcreatorItem_TargetTicket(), new Ticket_Ticket());
       foreach ($all_targets as $targetType => $targets) {
          foreach ($targets as $targetObject) {
             // Check the condition of the target
-            $this->questionFields = $form->getFields();
-            $answers_values = $this->getAnswers($this->getID());
-            foreach ($this->questionFields as $id => $field) {
-               $this->questionFields[$id]->deserializeValue($answers_values['formcreator_field_' . $id]);
-            }
-
             if (!PluginFormcreatorFields::isVisible($targetObject, $this->questionFields)) {
                // The target shall not be generated
                continue;