Commit 89f6b75c authored by Johan Cwiklinski's avatar Johan Cwiklinski
Browse files

Merge branch '9.4/bugfixes' into 9.5/bugfixes

parents 4d03e17c d111c802
......@@ -412,13 +412,6 @@ class Item_Ticket extends CommonDBRelation{
}
$data = array_keys(getAllDataFromTable('glpi_items_tickets'));
$used = [];
if (!empty($data)) {
foreach ($data as $val) {
$used[$val['itemtype']] = $val['id'];
}
}
self::dropdownAllDevices("itemtype", null, 0, 1, $dev_user_id, $ticket->fields["entities_id"], ['tickets_id' => $instID, 'used' => $used, 'rand' => $rand]);
echo "<span id='item_ticket_selection_information$rand'></span>";
echo "</td><td class='center' width='30%'>";
......
......@@ -848,7 +848,6 @@ class Stat extends CommonGLPI {
break;
case "requesttypes_id" :
case "solutiontypes_id" :
case "urgency" :
case "impact" :
case "priority" :
......@@ -859,6 +858,22 @@ class Stat extends CommonGLPI {
$WHERE["$table.$param"] = $value;
break;
case "solutiontypes_id" :
$LEFTJOIN = [
'glpi_itilsolutions' => [
'ON' => [
'glpi_itilsolutions' => 'items_id',
'glpi_tickets' => 'id', [
'AND' => [
'glpi_itilsolutions.itemtype' => 'Ticket'
]
]
]
]
];
$WHERE["glpi_itilsolutions.$param"] = $value;
break;
case "device":
$devtable = getTableForItemType('Computer_'.$value2);
$fkname = getForeignKeyFieldForTable(getTableForItemType($value2));
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment