From 1f46629aeae7acdb9ea12c11e0d7614982b06f40 Mon Sep 17 00:00:00 2001 From: Oliver Gorwits Date: Thu, 30 Jan 2014 07:19:52 +0000 Subject: [PATCH] show last discovered in device search, to help when old/duplicates are in DB --- Netdisco/lib/App/Netdisco/Web/Plugin/Search/Device.pm | 6 ++++-- Netdisco/share/views/ajax/search/device.tt | 2 ++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Netdisco/lib/App/Netdisco/Web/Plugin/Search/Device.pm b/Netdisco/lib/App/Netdisco/Web/Plugin/Search/Device.pm index 596b83dd..9442ec31 100644 --- a/Netdisco/lib/App/Netdisco/Web/Plugin/Search/Device.pm +++ b/Netdisco/lib/App/Netdisco/Web/Plugin/Search/Device.pm @@ -19,13 +19,15 @@ get '/ajax/content/search/device' => require_login sub { my $set; if ($has_opt) { - $set = schema('netdisco')->resultset('Device')->search_by_field(scalar params); + $set = schema('netdisco')->resultset('Device') + ->with_times->search_by_field(scalar params); } else { my $q = param('q'); send_error('Missing query', 400) unless $q; - $set = schema('netdisco')->resultset('Device')->search_fuzzy($q); + $set = schema('netdisco')->resultset('Device') + ->with_times->search_fuzzy($q); } return unless $set->count; diff --git a/Netdisco/share/views/ajax/search/device.tt b/Netdisco/share/views/ajax/search/device.tt index 7168f9ed..4fe973a2 100644 --- a/Netdisco/share/views/ajax/search/device.tt +++ b/Netdisco/share/views/ajax/search/device.tt @@ -9,6 +9,7 @@ OS Version Management IP Serial + Last Discovered @@ -22,6 +23,7 @@ [% row.os_ver | html_entity %] [% row.ip | html_entity %] [% row.serial | html_entity %] + [% row.last_discover_stamp | html_entity %] [% END %]