fix(dropdownfield): restrict by entity when needed

Signed-off-by: Thierry Bugier <tbugier@teclib.com>
pluginsGLPI · Nov 22, 2018 · a63c04f · a63c04f
1 parent ef73e98
commit a63c04f
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/inc/fields/dropdownfield.class.php b/inc/fields/dropdownfield.class.php
@@ -57,6 +57,7 @@ public function displayField($canEdit = true) {
             $dparams = ['name'     => $fieldName,
                         'value'    => $this->value,
                         'comments' => false,
+                        'entity'   => $_SESSION['glpiactive_entity'],
                         'rand'     => $rand];
 
             switch ($itemtype) {
@@ -78,13 +79,13 @@ public function displayField($canEdit = true) {
                         $dparams['condition'] .= " AND `is_incident` = '1'";
                         break;
                      case 'both':
-                        $dparams['condition'] .= " AND `is_incident` = '1' OR `is_request` = '1' ";
+                        $dparams['condition'] .= " AND (`is_incident` = '1' OR `is_request` = '1')";
                         break;
                      case 'change':
                         $dparams['condition'] .= " AND `is_change` = '1'";
                         break;
                      case 'all':
-                        $dparams['condition'] .= " AND `is_change` = '1' OR `is_incident` = '1' OR  `is_request` = '1'";
+                        $dparams['condition'] .= " AND (`is_change` = '1' OR `is_incident` = '1' OR  `is_request` = '1')";
                         break;
                   }
                   if (isset($decodedValues['show_ticket_categories_depth'])