diff options
| author | Simon Rettberg | 2017-07-06 13:13:05 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2017-07-06 13:13:05 +0200 |
| commit | 7952eec8471a4e9d5b229223163dfa6a25566be8 (patch) | |
| tree | 33906d5e928715fadb86310d4aed49bb6d2fc378 /modules-available/roomplanner | |
| parent | [locationinfo] Support runmode module (diff) | |
| download | slx-admin-7952eec8471a4e9d5b229223163dfa6a25566be8.tar.gz slx-admin-7952eec8471a4e9d5b229223163dfa6a25566be8.tar.xz slx-admin-7952eec8471a4e9d5b229223163dfa6a25566be8.zip | |
[roomplanner] Support : in mac search, use small display of client
Diffstat (limited to 'modules-available/roomplanner')
| -rw-r--r-- | modules-available/roomplanner/clientscript.js | 10 |
1 files changed, 7 insertions, 3 deletions
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) { + '</div>'; } +function renderMachineSelected(item, escape) { + return '<div>' + escape(item.hostname) + '</div>'; +} + 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', |