fix(glpiselectfield): entity restriction not applied on users

Author: btry

inc/field/dropdownfield.class.php

@@ -44,6 +44,7 @@
 use CommonTreeDropdown;
 use ITILCategory;
 use Entity;
+use Profile_User;
 use User;
 use Group;
 use Group_Ticket;
@@ -250,6 +251,38 @@ public function buildParams($rand = null) {
 
          case User::class:
             $dparams['right'] = 'all';
+            $currentEntity = Session::getActiveEntity();
+            $ancestorEntities = getAncestorsOf(Entity::getTable(), $currentEntity);
+            switch ($decodedValues['entity_restrict']) {
+               case self::ENTITY_RESTRICT_FORM:
+                  $form = new PluginFormcreatorForm();
+                  $form->getFromDBByQuestion($this->getQuestion());
+                  $currentEntity = $form->fields['entities_id'];
+                  $ancestorEntities = getAncestorsOf(Entity::getTable(), $currentEntity);
+                  break;
+
+               case self::ENTITY_RESTRICT_BOTH:
+                  $form = new PluginFormcreatorForm();
+                  $form->getFromDBByQuestion($this->getQuestion());
+                  $currentEntity = [$currentEntity, $form->fields['entities_id']];
+                  $ancestorEntities = array_merge($ancestorEntities, getAncestorsOf(Entity::getTable(), $currentEntity));
+                  break;
+            }
+            $where = ['OR' => []];
+            $where['OR'][] = ['entities_id' => $currentEntity];
+            if (count($ancestorEntities) > 0) {
+               $where['OR'][] = [
+                  'entities_id' => $ancestorEntities,
+                  'is_recursive' => '1',
+               ];
+            }
+            $dparams_cond_crit = [
+               'id' => new QuerySubQuery([
+                  'SELECT' => 'users_id',
+                  'FROM' => Profile_User::getTable(),
+                  'WHERE' => $where,
+               ])
+            ];
             break;
 
          case ITILCategory::class:

inc/field/glpiselectfield.class.php

@@ -180,9 +180,7 @@ public function prepareQuestionInputForSave($input) {
       $input['itemtype'] = $itemtype;
       $input['values'] = [];
       // Params for entity restrictables itemtypes
-      if ((new $itemtype)->isEntityAssign()) {
-         $input['values']['entity_restrict'] = $input['entity_restrict'] ?? self::ENTITY_RESTRICT_FORM;
-      }
+      $input['values']['entity_restrict'] = $input['entity_restrict'] ?? self::ENTITY_RESTRICT_FORM;
       unset($input['entity_restrict']);
 
       $input['default_values'] = isset($input['dropdown_default_value']) ? $input['dropdown_default_value'] : '';