From 099b2da2dcb6f458e7716930b5b51620d4ff8242 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 17 Oct 2021 18:58:34 +0200 Subject: [PATCH] FIX #18974 --- htdocs/core/class/extrafields.class.php | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php index 4ec87d75974..0145ad95a7d 100644 --- a/htdocs/core/class/extrafields.class.php +++ b/htdocs/core/class/extrafields.class.php @@ -2079,9 +2079,15 @@ class ExtraFields } $enabled = 1; - if (isset($this->attributes[$object->table_element]['list'][$key])) { - $enabled = dol_eval($this->attributes[$object->table_element]['list'][$key], 1); + if (isset($this->attributes[$object->table_element]['enabled'][$key])) { // 'enabled' is often a condition on module enabled or not + $enabled = dol_eval($this->attributes[$object->table_element]['enabled'][$key], 1); } + + $visibility = 1; + if (isset($this->attributes[$object->table_element]['list'][$key])) { // 'list' is option for visibility + $visibility = dol_eval($this->attributes[$object->table_element]['list'][$key], 1); + } + $perms = 1; if (isset($this->attributes[$object->table_element]['perms'][$key])) { $perms = dol_eval($this->attributes[$object->table_element]['perms'][$key], 1); @@ -2089,6 +2095,9 @@ class ExtraFields if (empty($enabled)) { continue; } + if (empty($visibility)) { + continue; + } if (empty($perms)) { continue; }