fix(condition): condition loss if itil target edited

Author: btry

inc/abstractitiltarget.class.php

@@ -1580,10 +1580,6 @@ public function prepareInputForUpdate($input) {
          }
       }
 
-      if (!$this->checkConditionSettings($input)) {
-         $input['show_rule'] = PluginFormcreatorCondition::SHOW_RULE_ALWAYS;
-      }
-
       return $input;
    }
 

inc/conditionnabletrait.class.php

@@ -78,7 +78,8 @@ public function checkConditions(array $input): bool {
 
    public function checkConditionSettings(array $input): bool {
       if (!isset($input['show_rule'])) {
-         return false;
+         // Inconsistency if show_rule set but no condition set
+         return !isset($input['_conditions']);
       }
       $showRule = $input['show_rule'];
       if ($showRule == PluginFormcreatorCondition::SHOW_RULE_ALWAYS) {
@@ -114,12 +115,23 @@ public function updateConditions($input) : bool {
       $itemtype = $this->getType();
       $itemId = $this->getID();
 
-      // Delete all existing conditions for the question
-      $this->deleteConditions();
-      if ($this->fields['show_rule'] == PluginFormcreatorCondition::SHOW_RULE_ALWAYS) {
-         // No condition ? Exit now !
+      if (!isset($this->input['show_rule']) && isset($this->fields['show_rule']) && $this->fields['show_rule'] == PluginFormcreatorCondition::SHOW_RULE_ALWAYS) {
+         // rule not changed and is currently "always show"
+         $this->deleteConditions();
+         return true;
+      }
+      if (!isset($this->input['show_rule']) && isset($this->fields['show_rule']) && $this->fields['show_rule'] != PluginFormcreatorCondition::SHOW_RULE_ALWAYS) {
+         // Rule not changed and is not "always show"
          return true;
       }
+      if (isset($this->input['show_rule']) && $this->input['show_rule'] == PluginFormcreatorCondition::SHOW_RULE_ALWAYS) {
+         // rule changed to "always show"
+         $this->deleteConditions();
+         return true;
+      }
+
+      // Delete all existing conditions for the question
+      $this->deleteConditions();
 
       $input = $input['_conditions'];
 

tests/3-unit/PluginFormcreatorTargetTicket.php

@@ -1309,7 +1309,6 @@ public function providerPrepareInputForAdd() {
                'content' => '##FULLFORM##',
                'type_rule'     => \PluginFormcreatorTargetTicket::REQUESTTYPE_SPECIFIC,
                'type_question' => \Ticket::INCIDENT_TYPE,
-               'show_rule'     => \PluginFormcreatorCondition::SHOW_RULE_ALWAYS,
                'source_rule'   => \PluginFormcreatorTargetTicket::REQUESTSOURCE_SPECIFIC,
                'source_question' => $sourceId,
             ],
@@ -1330,7 +1329,6 @@ public function providerPrepareInputForAdd() {
                'content' => '##FULLFORM##',
                'type_rule'     => \PluginFormcreatorTargetTicket::REQUESTTYPE_SPECIFIC,
                'type_question' => \Ticket::DEMAND_TYPE,
-               'show_rule'     => \PluginFormcreatorCondition::SHOW_RULE_ALWAYS,
                'source_rule'   => \PluginFormcreatorTargetTicket::REQUESTSOURCE_NONE,
                'source_question' => 0,
             ],