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

[#46] Sorting on Inventory page same as ND1

Browse Source
This commit is contained in:
Oliver Gorwits
2014-02-08 22:18:13 +00:00
parent 9de450f500
commit 1e2cc41b76
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Netdisco/Changes
View File

@@ -21,6 +21,7 @@
* [#84] No longer use dns as a key into devices; cope with dupe dns (LT) * [#84] No longer use dns as a key into devices; cope with dupe dns (LT)
* Correct date formatting and logic in IP Inventory report * Correct date formatting and logic in IP Inventory report
* Fix redirect when accessing a deep link when unauthenticated * Fix redirect when accessing a deep link when unauthenticated
* [#46] Sorting on Inventory page same as ND1
2.022000 - 2014-01-26 2.022000 - 2014-01-26

4
Netdisco/lib/App/Netdisco/DB/ResultSet/Device.pm
View File

@@ -483,7 +483,7 @@ sub get_models {
select => [ 'vendor', 'model', { count => 'ip' } ], select => [ 'vendor', 'model', { count => 'ip' } ],
as => [qw/vendor model count/], as => [qw/vendor model count/],
group_by => [qw/vendor model/], group_by => [qw/vendor model/],
order_by => [{-asc => 'vendor'}, {-desc => 'count'}, {-asc => 'model'}], order_by => [{-asc => 'vendor'}, {-asc => 'model'}],
}) })
} }
@@ -513,7 +513,7 @@ sub get_releases {
select => [ 'os', 'os_ver', { count => 'ip' } ], select => [ 'os', 'os_ver', { count => 'ip' } ],
as => [qw/os os_ver count/], as => [qw/os os_ver count/],
group_by => [qw/os os_ver/], group_by => [qw/os os_ver/],
order_by => [{-asc => 'os'}, {-desc => 'count'}, {-asc => 'os_ver'}], order_by => [{-asc => 'os'}, {-asc => 'os_ver'}],
}) })
} }