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/admintask/orphaned.tt
View File

@@ -22,7 +22,7 @@
<tbody>
[% FOREACH row IN orphans %]
<tr>
<td><a href="[% uri_for('/device') %]?q=[% row.dns || row.ip | uri %]">
<td><a href="[% uri_for('/device') %]?q=[% row.ip | uri %]">
[% row.dns || row.name || row.ip | html_entity %]</a></td>
<td>
[% IF row.location %]
@@ -75,7 +75,7 @@
<tbody>
[% FOREACH row IN network %]
<tr>
<td><a href="[% uri_for('/device') %]?tab=netmap&q=[% row.dns || row.ip | uri %]">
<td><a href="[% uri_for('/device') %]?tab=netmap&q=[% row.ip | uri %]">
[% row.dns || row.name || row.ip | html_entity %]</a></td>
<td>
[% IF row.location %]