Add all Item_Devices* to location_types; permit to display all located items, fix overrided variable

refs #7054

Author: trasher

inc/define.php

@@ -323,6 +323,10 @@
                                                   'DeviceCase', 'DevicePowerSupply', 'DeviceGeneric',
                                                   'DeviceSimcard', 'DeviceSensor'];
 
+foreach ($CFG_GLPI['device_types'] as $dtype) {
+   $CFG_GLPI['location_types'][] = 'Item_' . $dtype;
+}
+
 $CFG_GLPI["itemdevices_types"]            = ['Computer', 'NetworkEquipment', 'Peripheral',
                                                   'Phone', 'Printer', 'Enclosure'];
 

inc/location.class.php

@@ -390,15 +390,19 @@ function showItems() {
       global $DB, $CFG_GLPI;
 
       $locations_id = $this->fields['id'];
-      $itemtype     = Session::getSavedOption(__CLASS__, 'criterion', '');
+      $current_itemtype     = Session::getSavedOption(__CLASS__, 'criterion', '');
 
       if (!$this->can($locations_id, READ)) {
          return false;
       }
 
       $queries = [];
-      $itemtypes = $itemtype ? [$itemtype] : $CFG_GLPI['location_types'];
+      $itemtypes = $current_itemtype ? [$current_itemtype] : $CFG_GLPI['location_types'];
       foreach ($itemtypes as $itemtype) {
+         $item = new $itemtype();
+         if (!$item->maybeLocated()) {
+            continue;
+         }
          $table = getTableForItemType($itemtype);
          $itemtype_criteria = [
             'SELECT' => [
@@ -410,7 +414,6 @@ function showItems() {
                "$table.locations_id"   => $locations_id,
             ] + getEntitiesRestrictCriteria($table, 'entities_id')
          ];
-         $item = new $itemtype();
          if ($item->maybeDeleted()) {
             $itemtype_criteria['WHERE']['is_deleted'] = 0;
          }
@@ -437,9 +440,13 @@ function showItems() {
       echo "<tr class='tab_bg_1'><th colspan='2'>".__('Type')."</th></tr>";
       echo "<tr class='tab_bg_1'><td class='center'>";
       echo __('Type')."&nbsp;";
-      Dropdown::showItemType($CFG_GLPI['location_types'],
-                             ['value'      => $itemtype,
-                                   'on_change'  => 'reloadTab("start=0&criterion="+this.value)']);
+      $all_types = array_merge(['0' => '---'], $CFG_GLPI['location_types']);
+      Dropdown::showItemType(
+         $all_types, [
+            'value'      => $current_itemtype,
+            'on_change'  => 'reloadTab("start=0&criterion="+this.value)'
+         ]
+      );
       echo "</td></tr></table>";
 
       if ($number) {