135/netdisco
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

DataTables render function should check for type

Browse Source
This commit is contained in:
Oliver Gorwits
2014-07-21 21:48:52 +00:00
parent 7241db7a23
commit c1846103fe
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Netdisco/Changes
View File

@@ -4,6 +4,7 @@
* DNS Mismatch report incorrectly trimmed domain_suffix * DNS Mismatch report incorrectly trimmed domain_suffix
* Fake one device aliases entry for devices not providing ip_index * Fake one device aliases entry for devices not providing ip_index
* DataTables render function should check for type
2.028006 - 2014-07-21 2.028006 - 2014-07-21

14
Netdisco/share/views/ajax/report/ipinventory.tt
View File

@@ -25,11 +25,15 @@ $(document).ready(function() {
"data": 'ip', "data": 'ip',
"render": function(data, type, row, meta) { "render": function(data, type, row, meta) {
var cell_str = he.encode(data); var cell_str = he.encode(data);
if (row.time_last && row.node) { if (type == 'display') {
cell_str = '<a href="[% search_node %]&q=' + encodeURIComponent(data) + (row.active ? '' : '&archived=on') + '">' + he.encode(data) + (row.active ? '' : '&nbsp;<i class="icon-book text-warning"></i>&nbsp;') + '</a>'; if (row.time_last && row.node) {
} cell_str = '<a href="[% search_node %]&q=' + encodeURIComponent(data)
else if (row.time_last) { + (row.active ? '' : '&archived=on') + '">' + he.encode(data)
cell_str = '<a href="[% search_device %]&q=' + encodeURIComponent(data) + '">' + he.encode(data) + '</a>'; + (row.active ? '' : '&nbsp;<i class="icon-book text-warning"></i>&nbsp;') + '</a>';
}
else if (row.time_last) {
cell_str = '<a href="[% search_device %]&q=' + encodeURIComponent(data) + '">' + he.encode(data) + '</a>';
}
} }
return cell_str; return cell_str;
} }