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

#875 Node Search - swap IP and DNS, add system name, highlight most recent, in the Switch Port rows

Browse Source
This commit is contained in:
Oliver Gorwits
2022-08-16 22:25:27 +01:00
parent dd468efdd5
commit 4d49f04d2a
4 changed files with 50 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/App/Netdisco/DB/Result/NodeIp.pm
View File

@@ -92,7 +92,7 @@ See also the C<node_sightings> helper routine, below.
=cut
__PACKAGE__->has_many( nodes => 'App::Netdisco::DB::Result::Node',
{ 'foreign.mac' => 'self.mac' } );
{ 'foreign.mac' => 'self.mac' }, { order_by => { '-desc' => 'time_last' }} );
=head2 netbios

4
lib/App/Netdisco/Web/Plugin/Search/Node.pm
View File

@@ -182,7 +182,7 @@ get '/ajax/content/search/node' => require_login sub {
my $rs_dp = schema('netdisco')->resultset('DevicePort');
if ($sightings->has_rows or $ips->has_rows or $netbios->has_rows) {
my $ports = param('deviceports')
? $rs_dp->search({ -and => [@where_mac] }) : undef;
? $rs_dp->search({ -and => [@where_mac] }, { order_by => { '-desc' => 'creation' }}) : undef;
return template 'ajax/search/node_by_mac.tt', {
ips => $ips,
@@ -194,7 +194,7 @@ get '/ajax/content/search/node' => require_login sub {
}
else {
my $ports = param('deviceports')
? $rs_dp->search({ -and => [@where_mac, @porttimes] }) : undef;
? $rs_dp->search({ -and => [@where_mac, @porttimes] }, { order_by => { '-desc' => 'creation' }}) : undef;
if (defined $ports and $ports->has_rows) {
return template 'ajax/search/node_by_mac.tt', {