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

No longer use dns as a key into devices; cope with dupe dns

Browse Source
This commit is contained in:
Oliver Gorwits
2014-02-02 17:46:27 +00:00
parent e23c30f0be
commit dedc7f1867
27 changed files with 55 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Netdisco/lib/App/Netdisco/Web/Device.pm
View File

@@ -154,20 +154,29 @@ hook 'before_template' => sub {
get '/device' => require_login sub {
my $q = param('q');
my $dev = schema('netdisco')->resultset('Device')->single({
my $schema = schema('netdisco')->resultset('Device');
# we are passed either dns or ip
my $dev = $schema->search({
-or => [
\[ 'host(me.ip) = ?' => [ bind_value => $q ] ],
'me.dns' => $q,
],
});
if (!defined $dev) {
if ($dev->count == 0) {
return redirect uri_for('/', {nosuchdevice => 1})->path_query;
}
# if passed dns, need to check for duplicates
# and use only ip for q param, if there are duplicates.
my $first = $dev->first;
my $others = ($schema->search({dns => $first->dns})->count() - 1);
params->{'tab'} ||= 'details';
template 'device', {
d => $dev,
display_name => ($others ? $first->ip : $first->dns),
device => params->{'tab'},
};
};

6
Netdisco/lib/App/Netdisco/Web/Plugin/Search/Device.pm
View File

@@ -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;

2
Netdisco/lib/App/Netdisco/Web/Search.pm
View File

@@ -81,7 +81,7 @@ get '/search' => require_login sub {
# redirect to device details for the one device
return redirect uri_for('/device', {
tab => 'details',
q => ($nd->first->dns || $nd->first->ip),
q => $nd->first->ip,
f => '',
})->path_query;
}