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

No longer use dns as a key into devices; cope with dupe dns

Browse Source
This commit is contained in:
Oliver Gorwits
2014-02-02 17:46:27 +00:00
parent e23c30f0be
commit dedc7f1867
27 changed files with 55 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Netdisco/share/views/ajax/search/device.tt
View File

@@ -9,12 +9,13 @@
<th>OS Version</th>
<th>Management IP</th>
<th>Serial</th>
<th>Last Discovered</th>
</tr>
</thead>
</tbody>
[% WHILE (row = results.next) %]
<tr>
<td><a href="[% uri_for('/device') %]?q=[% row.dns || row.ip | uri %]">[% row.dns || row.ip | html_entity %]</a></td>
<td><a href="[% uri_for('/device') %]?q=[% row.ip | uri %]">[% row.dns || row.ip | html_entity %]</a></td>
<td>[% row.contact | html_entity %]</td>
<td>[% row.location | html_entity %]</td>
<td>[% row.name | html_entity %]</td>
@@ -22,6 +23,7 @@
<td>[% row.os_ver | html_entity %]</td>
<td>[% row.ip | html_entity %]</td>
<td>[% row.serial | html_entity %]</td>
<td>[% row.last_discover_stamp | html_entity %]</td>
</tr>
[% END %]
</tbody>