fix(fields): preveint fatal error when inconsistency found in DB

log the error Signed-off-by: Thierry Bugier <tbugier@teclib.com>
pluginsGLPI · Aug 18, 2021 · 65c461a · 65c461a
1 parent 0529a4e
commit 65c461a
Showing 1 changed file with 17 additions and 6 deletions.
diff --git a/inc/fields.class.php b/inc/fields.class.php
@@ -186,12 +186,23 @@ public static function isVisible(PluginFormcreatorConditionnableInterface $item,
          return self::$visibility[$itemtype][$itemId];
       }
       if (count($conditions) < 1) {
-         if ($item->fields['show_rule'] == PluginFormcreatorCondition::SHOW_RULE_HIDDEN) {
-            self::$visibility[$itemtype][$itemId] = false;
-            return self::$visibility[$itemtype][$itemId];
-         } else if ($item->fields['show_rule'] == PluginFormcreatorCondition::SHOW_RULE_SHOWN) {
-            self::$visibility[$itemtype][$itemId] = true;
-            return self::$visibility[$itemtype][$itemId];
+         switch ($item->fields['show_rule']) {
+            case PluginFormcreatorCondition::SHOW_RULE_HIDDEN:
+               self::$visibility[$itemtype][$itemId] = false;
+               return self::$visibility[$itemtype][$itemId];
+               break;
+
+            case PluginFormcreatorCondition::SHOW_RULE_SHOWN:
+               self::$visibility[$itemtype][$itemId] = true;
+               return self::$visibility[$itemtype][$itemId];
+               break;
+
+            default:
+               // This should not happen : inconsistency in the database
+               Toolbox::logError("Inconsistency detected in conditions: show rule set but no condition found, $itemtype ID=$itemId");
+               self::$visibility[$itemtype][$itemId] = $getParentVisibility();
+               return self::$visibility[$itemtype][$itemId];
+               break;
          }
       }