From bb38f40816b0ec87b76dec860a04679fd35db79e Mon Sep 17 00:00:00 2001
From: Oliver Gorwits <oliver@cpan.org>
Date: Sat, 22 Feb 2014 11:24:18 +0000
Subject: [PATCH] fix to IP Inventory for nodes with archive records.

also change column Device to be named Node.
---
 Netdisco/Changes                                           | 1 +
 Netdisco/lib/App/Netdisco/Web/Plugin/Report/IpInventory.pm | 1 +
 Netdisco/share/views/ajax/report/ipinventory.tt            | 5 +++--
 Netdisco/share/views/ajax/report/ipinventory_csv.tt        | 2 +-
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/Netdisco/Changes b/Netdisco/Changes
index a861e0aa..cf23e06b 100644
--- a/Netdisco/Changes
+++ b/Netdisco/Changes
@@ -20,6 +20,7 @@
   * Fix for crash when selecting Last Change column in device ports view
   * Fix IP Inventory Report to work without daterange
   * Fix "list IPs never seen" to work without daterange in IP Inventory Report
+  * Correct "Archive" status of nodes in IP Inventory Report
 
 2.023002 - 2014-02-17
 
diff --git a/Netdisco/lib/App/Netdisco/Web/Plugin/Report/IpInventory.pm b/Netdisco/lib/App/Netdisco/Web/Plugin/Report/IpInventory.pm
index a7ad1216..f1e807d0 100644
--- a/Netdisco/lib/App/Netdisco/Web/Plugin/Report/IpInventory.pm
+++ b/Netdisco/lib/App/Netdisco/Web/Plugin/Report/IpInventory.pm
@@ -109,6 +109,7 @@ get '/ajax/content/report/ipinventory' => require_login sub {
                 'ip',     'dns',  'time_last', 'time_first',
                 'active', 'node', 'age'
             ],
+            order_by => [{-asc => 'ip'}, {-desc => 'active'}],
         }
     )->as_query;
 
diff --git a/Netdisco/share/views/ajax/report/ipinventory.tt b/Netdisco/share/views/ajax/report/ipinventory.tt
index fbd5d718..ffafa08b 100644
--- a/Netdisco/share/views/ajax/report/ipinventory.tt
+++ b/Netdisco/share/views/ajax/report/ipinventory.tt
@@ -1,7 +1,7 @@
 <table class="table table-bordered table-condensed table-striped nd_floatinghead">
   <thead>
     <tr>
-      <th>Device</th>
+      <th>Node</th>
       <th class="nd_center-cell">DNS</th>
       <th class="nd_center-cell">Last Used</th>      
       <th class="nd_center-cell">First Discovered</th>
@@ -11,7 +11,8 @@
     [% FOREACH row IN results %]
     <tr>
     [% IF row.time_last && row.node %]
-      <td><a href="[% search_node %]&q=[% row.ip | uri %]">[% row.ip | html_entity %]</a>
+      <td><a href="[% search_node %]&q=[% row.ip | uri %][% '&archived=on' IF NOT row.active %]">
+        [% row.ip | html_entity %]</a>
         [% '&nbsp;<i class="icon-book text-warning"></i>&nbsp;' IF NOT row.active %]
       </td>
     [% ELSIF row.time_last %]
diff --git a/Netdisco/share/views/ajax/report/ipinventory_csv.tt b/Netdisco/share/views/ajax/report/ipinventory_csv.tt
index c67564e4..24299690 100644
--- a/Netdisco/share/views/ajax/report/ipinventory_csv.tt
+++ b/Netdisco/share/views/ajax/report/ipinventory_csv.tt
@@ -1,5 +1,5 @@
 [% USE CSV %]
-[% CSV.dump([ 'Device' 'DNS' 'Time Last' 'Time First' ]) %]
+[% CSV.dump([ 'Node' 'DNS' 'Time Last' 'Time First' ]) %]
 
 [% FOREACH row IN results %]
   [% mylist = [] %]