feat(glpiselectfield): refactor entity_restriction

pluginsGLPI · Mar 30, 2023 · b3fb080 · b3fb080
1 parent 2fd6cf5
commit b3fb080
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 10 deletions.
diff --git a/inc/field/dropdownfield.class.php b/inc/field/dropdownfield.class.php
@@ -39,6 +39,7 @@
 use Toolbox;
 use Session;
 use DBUtils;
+use Document;
 use Dropdown;
 use CommonITILActor;
 use CommonITILObject;
@@ -62,11 +63,12 @@
 use Glpi\Application\View\TemplateRenderer;
 class DropdownField extends PluginFormcreatorAbstractField
 {
-
    const ENTITY_RESTRICT_USER = 1;
    const ENTITY_RESTRICT_FORM = 2;
    const ENTITY_RESTRICT_BOTH = 3;
 
+   protected static $noEntityRrestrict = [Entity::class, Document::class];
+
    public function getEnumEntityRestriction() {
       return [
          self::ENTITY_RESTRICT_USER =>  User::getTypeName(1),
@@ -94,10 +96,14 @@ public function showForm(array $options): void {
       $this->question->fields['_entity_restrict'] = $decodedValues['entity_restrict'] ?? self::ENTITY_RESTRICT_FORM;
       $this->question->fields['_is_tree'] = '0';
       $this->question->fields['_is_entity_restrict'] = '0';
+      if (isset($this->question->fields['itemtype']) && is_subclass_of($this->question->fields['itemtype'], CommonDBTM::class)) {
+         if (!in_array($this->question->fields['itemtype'], self::$noEntityRrestrict)) {
+            $item = new $this->question->fields['itemtype'];
+            $this->question->fields['_is_entity_restrict'] = $item->isEntityAssign() ? '1' : '0';
+         }
+      }
       if (isset($this->question->fields['itemtype']) && is_subclass_of($this->question->fields['itemtype'], CommonTreeDropdown::class)) {
          $this->question->fields['_is_tree'] = '1';
-         $item = new $this->question->fields['itemtype'];
-         $this->question->fields['_is_entity_restrict'] = $item->isEntityAssign() ? '1' : '0';
       }
       $this->question->fields['default_values'] = Html::entities_deep($this->question->fields['default_values']);
       $this->deserializeValue($this->question->fields['default_values']);
@@ -136,6 +142,10 @@ public function buildParams($rand = null) {
          JSON_OBJECT_AS_ARRAY
       );
 
+      if (in_array($itemtype, self::$noEntityRrestrict)) {
+         unset($dparams['entity']);
+      }
+
       switch ($itemtype) {
          case SLA::class:
          case OLA::class:
@@ -145,11 +155,6 @@ public function buildParams($rand = null) {
             }
             break;
 
-         case Entity::class:
-         case Document::class:
-            unset($dparams['entity']);
-            break;
-
          case User::class:
             $dparams['right'] = 'all';
             $currentEntity = Session::getActiveEntity();

diff --git a/inc/field/glpiselectfield.class.php b/inc/field/glpiselectfield.class.php
@@ -58,8 +58,10 @@ public function showForm(array $options): void {
       $this->question->fields['_is_tree'] = '0';
       $this->question->fields['_is_entity_restrict'] = '0';
       if (isset($this->question->fields['itemtype']) && is_subclass_of($this->question->fields['itemtype'], CommonDBTM::class)) {
-         $item = new $this->question->fields['itemtype'];
-         $this->question->fields['_is_entity_restrict'] = $item->isEntityAssign() ? '1' : '0';
+         if (!in_array($this->question->fields['itemtype'], self::$noEntityRrestrict)) {
+            $item = new $this->question->fields['itemtype'];
+            $this->question->fields['_is_entity_restrict'] = $item->isEntityAssign() ? '1' : '0';
+         }
       }
       if (isset($this->question->fields['itemtype']) && $this->question->fields['itemtype'] == User::class) {
          $this->question->fields['_is_entity_restrict'] = '1';