From 7952eec8471a4e9d5b229223163dfa6a25566be8 Mon Sep 17 00:00:00 2001 From: Simon Rettberg Date: Thu, 6 Jul 2017 13:13:05 +0200 Subject: [roomplanner] Support : in mac search, use small display of client --- modules-available/roomplanner/clientscript.js | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'modules-available/roomplanner') diff --git a/modules-available/roomplanner/clientscript.js b/modules-available/roomplanner/clientscript.js index 53e0164a..1cd65132 100644 --- a/modules-available/roomplanner/clientscript.js +++ b/modules-available/roomplanner/clientscript.js @@ -14,7 +14,7 @@ var placedMachines = []; function makeCombinedField(machineArray) { machineArray.forEach(function (v,i,a){ - machineArray[i].combined = (v.machineuuid + " " + v.hostname + " " + v.clientip + " " + v.macaddr).toLocaleLowerCase(); + machineArray[i].combined = (v.machineuuid + " " + v.hostname + " " + v.clientip + " " + v.macaddr + " " + v.macaddr.replace(/-/g, ':')).toLocaleLowerCase(); }); return machineArray; } @@ -48,6 +48,10 @@ function renderMachineEntry(item, escape) { + ''; } +function renderMachineSelected(item, escape) { + return '
' + escape(item.hostname) + '
'; +} + var queryCache = {}; function filterCache(key, query) { @@ -113,7 +117,7 @@ function initSelectize() { searchField: "combined", openOnFocus: false, create: false, - render : { option : renderMachineEntry, item: renderMachineEntry}, + render : { option : renderMachineEntry, item: renderMachineSelected}, load: loadMachines, maxItems: 1, sortField: 'hostname', @@ -130,7 +134,7 @@ function initSelectize() { searchField: "combined", openOnFocus: true, create: false, - render : { option : renderMachineEntry, item: renderMachineEntry}, + render : { option : renderMachineEntry, item: renderMachineSelected}, maxItems: 1, sortField: 'hostname', sortDirection: 'asc', -- cgit v1.2.3-55-g7522