Merge branch 'release/2.6.0'

pluginsGLPI · Dec 17, 2018 · efc90c1 · efc90c1
2 parents 830b7fd + e0c60df
commit efc90c1
Show file tree

Hide file tree

Showing 5 changed files with 233 additions and 91 deletions.
diff --git a/ajax/dropdownReplaceFindDevice.php b/ajax/dropdownReplaceFindDevice.php
@@ -78,6 +78,14 @@
    $where .= " AND `is_helpdesk_visible` = '1' ";
 }
 
+if (isset($_REQUEST['used'])) {
+   $used = $_REQUEST['used'];
+
+   if (count($used)) {
+      $where .=" AND `$table`.`id` NOT IN ('".implode("','", $used)."' ) ";
+   }
+}
+
 if (isset($_REQUEST['current_item']) && ($_REQUEST['current_item'] > 0)) {
    $where .= " AND `id` != " . $_REQUEST['current_item'];
 }