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

Partial Match option when searching on device port name

Browse Source
This commit is contained in:
Oliver Gorwits
2013-03-02 15:24:48 +00:00
parent a94b5a913d
commit 26c5014479
4 changed files with 28 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Netdisco/Changes
View File

@@ -1,11 +1,16 @@
2.005000_003 - 2013-02-24 2.005000_003 - 2013-02-24
[NEW FEATURES]
* Partial Match option when searching on device port name
[ENHANCEMENTS] [ENHANCEMENTS]
* random() and LIMIT the number of daemon jobs requested from Netdisco queue * random() and LIMIT the number of daemon jobs requested from Netdisco queue
* Remove Daemon's job queue DBIC schema from user config * Remove Daemon's job queue DBIC schema from user config
* Add log messages to the Daemon * Add log messages to the Daemon
* Use Path::Class for path and file name construction consistently * Use Path::Class for path and file name construction consistently
* Avoid use of DNS when looking up devices in DB by IP
2.005000_002 - 2013-02-10 2.005000_002 - 2013-02-10

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

@@ -50,7 +50,7 @@ ajax '/ajax/content/search/node' => sub {
} }
else { else {
if (param('partial')) { if (param('partial')) {
$node = "\%$node\%"; $node = "\%$node\%" if $node !~ m/%/;
} }
elsif (setting('domain_suffix')) { elsif (setting('domain_suffix')) {
$node .= setting('domain_suffix') $node .= setting('domain_suffix')

11
Netdisco/lib/App/Netdisco/Web/Plugin/Search/Port.pm
View File

@@ -15,10 +15,17 @@ ajax '/ajax/content/search/port' => sub {
my $set; my $set;
if ($q =~ m/^\d+$/) { if ($q =~ m/^\d+$/) {
$set = schema('netdisco')->resultset('DevicePort')->search({vlan => $q}); $set = schema('netdisco')->resultset('DevicePort')
->search({vlan => $q});
} }
else { else {
$set = schema('netdisco')->resultset('DevicePort')->search({name => $q}); my $query = $q;
if (param('partial')) {
$q = "\%$q\%" if $q !~ m/%/;
$query = { -ilike => $q };
}
$set = schema('netdisco')->resultset('DevicePort')
->search({name => $query});
} }
return unless $set->count; return unless $set->count;

13
Netdisco/share/views/sidebar/search/port.tt Normal file
View File

@@ -0,0 +1,13 @@
<p class="nd_sidebar_title"><em>Port Search Options</em></p>
<input name="q" value="[% params.q %]" type="hidden"/>
<div class="clearfix input-prepend">
<label class="add-on">
<input type="checkbox" id="partial"
name="partial"[% ' checked="checked"' IF params.partial %]/>
</label>
<label class="nd_checkboxlabel" for="partial">
<span class="nd_searchcheckbox uneditable-input">Partial Name</span>
</label>
</div>
<button id="[% tab.id %]_submit" type="submit" class="btn btn-info">Search Again</button>