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

handle existing attr in overriden find(), sort device results

Browse Source
This commit is contained in:
Oliver Gorwits
2012-01-09 09:30:29 +00:00
parent 05559f583f
commit a0c4c21e61
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Netdisco/lib/Netdisco/DB/ResultSet/Device.pm
View File

@@ -7,10 +7,12 @@ use NetAddr::IP::Lite ':lower';
# override the built-in so we can munge some columns # override the built-in so we can munge some columns
sub find { sub find {
my ($set, $ip) = @_; my ($set, $ip, $attr) = @_;
$attr ||= {};
return $set->SUPER::find($ip, return $set->SUPER::find($ip,
{ {
%$attr,
'+select' => [ '+select' => [
\"replace(age(timestamp 'epoch' + uptime / 100 * interval '1 second', timestamp '1970-01-01 00:00:00-00')::text, 'mon', 'month')", \"replace(age(timestamp 'epoch' + uptime / 100 * interval '1 second', timestamp '1970-01-01 00:00:00-00')::text, 'mon', 'month')",
\"to_char(last_discover, 'YYYY-MM-DD HH24:MI')", \"to_char(last_discover, 'YYYY-MM-DD HH24:MI')",
@@ -75,6 +77,7 @@ sub by_field {
], ],
}, },
{ {
order_by => [qw/ me.dns me.ip /],
join => 'device_ips', join => 'device_ips',
group_by => 'me.ip', group_by => 'me.ip',
} }
@@ -105,6 +108,7 @@ sub by_any {
], ],
}, },
{ {
order_by => [qw/ me.dns me.ip /],
join => 'device_ips', join => 'device_ips',
group_by => 'me.ip', group_by => 'me.ip',
} }