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

update Node and NodeIp Result/ResultSet to have smarter value-add subs

Browse Source
This commit is contained in:
Oliver Gorwits
2012-02-04 22:23:19 +00:00
parent 85f531358a
commit 6a2f3fdf3a
6 changed files with 244 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Netdisco/views/ajax/search/node_by_ip.tt
View File

@@ -14,7 +14,7 @@
</tr>
</thead>
</tbody>
[% WHILE (row = results.next) %]
[% WHILE (row = macs.next) %]
<tr>
<td><a class="nd_linkcell"
href="[% uri_for('/search') %]?[% vars.query_defaults.node %]&q=[% row.mac | uri %]">[% row.mac %]</a></td>
@@ -27,11 +27,11 @@
[% ' <span class="label warning">a</span>' IF NOT row.active %]
</td>
[% IF params.stamps %]
<td>[% row.time_first %]</td>
<td>[% row.time_last %]</td>
<td>[% row.time_first_stamp %]</td>
<td>[% row.time_last_stamp %]</td>
[% END %]
</tr>
[% FOREACH node IN row.node_sightings(params.archived) %]
[% FOREACH node IN archive_filter(row.node_sightings) %]
<tr>
<td>&nbsp;</td>
[% IF params.vendor %]
@@ -43,12 +43,12 @@
[% ' <span class="label warning">a</span>' IF NOT node.active %]
</td>
[% IF params.stamps %]
<td>[% node.time_first %]</td>
<td>[% node.time_last %]</td>
<td>[% node.time_first_stamp %]</td>
<td>[% node.time_last_stamp %]</td>
[% END %]
</tr>
[% END %]
[% FOREACH nodeip IN row.ip_aliases(params.archived) %]
[% FOREACH nodeip IN archive_filter(row.ip_aliases) %]
<tr>
<td>&nbsp;</td>
[% IF params.vendor %]
@@ -60,8 +60,8 @@
[% ' <span class="label warning">a</span>' IF NOT nodeip.active %]
</td>
[% IF params.stamps %]
<td>[% nodeip.time_first %]</td>
<td>[% nodeip.time_last %]</td>
<td>[% nodeip.time_first_stamp %]</td>
<td>[% nodeip.time_last_stamp %]</td>
[% END %]
</tr>
[% END %]

8
Netdisco/views/ajax/search/node_by_mac.tt
View File

@@ -40,8 +40,8 @@
[% ' <span class="label warning">a</span>' IF NOT row.active %]
</td>
[% IF params.stamps %]
<td>[% row.time_first %]</td>
<td>[% rw.time_last %]</td>
<td>[% row.time_first_stamp %]</td>
<td>[% rw.time_last_stamp %]</td>
[% END %]
</tr>
[% SET first_row = 0 %]
@@ -71,8 +71,8 @@
[% ' <span class="label warning">a</span>' IF NOT node.active %]
</td>
[% IF params.stamps %]
<td>[% node.time_first %]</td>
<td>[% node.time_last %]</td>
<td>[% node.time_first_stamp %]</td>
<td>[% node.time_last_stamp %]</td>
[% END %]
</tr>
[% SET first_row = 0 %]