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

Merge branch 'master' into og-autoload

Browse Source
This commit is contained in:
Oliver Gorwits
2014-06-22 22:17:11 +01:00
parent 128e96f9a3 3a1cd19aa6
commit 7c47a277be
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Netdisco/lib/App/Netdisco/JobQueue/PostgreSQL.pm
View File

@@ -4,8 +4,8 @@ use Dancer qw/:moose :syntax :script/;
use Dancer::Plugin::DBIC 'schema'; use Dancer::Plugin::DBIC 'schema';
use Net::Domain 'hostfqdn'; use Net::Domain 'hostfqdn';
use Module::Load ();
use Try::Tiny; use Try::Tiny;
use MCE ();
use base 'Exporter'; use base 'Exporter';
our @EXPORT = (); our @EXPORT = ();
@@ -105,6 +105,7 @@ sub jq_userlog {
# MCE ->do() method. # MCE ->do() method.
sub jq_take { sub jq_take {
my ($wid, $type) = @_; my ($wid, $type) = @_;
Module::Load::load 'MCE';
# be polite to SQLite database (that is, local CPU) # be polite to SQLite database (that is, local CPU)
debug "$type ($wid): sleeping now..."; debug "$type ($wid): sleeping now...";

3
Netdisco/share/views/ajax/search/node_by_ip.tt
View File

@@ -103,7 +103,8 @@
[% END %] [% END %]
</td> </td>
<td>Switch Port</td> <td>Switch Port</td>
<td><a class="nd_linkcell nd_center-cell" <td class="nd_center-cell">
<a class="nd_linkcell"
href="[% device_ports %]&q=[% node.switch | uri %]&f=[% node.port | uri %]&c_nodes=on&c_neighbors=on"> href="[% device_ports %]&q=[% node.switch | uri %]&f=[% node.port | uri %]&c_nodes=on&c_neighbors=on">
[% node.switch | html_entity %] - [% node.port | html_entity %] [% node.switch | html_entity %] - [% node.port | html_entity %]
[% '&nbsp;<i class="icon-book text-warning"></i>' IF NOT node.active %]</a> [% '&nbsp;<i class="icon-book text-warning"></i>' IF NOT node.active %]</a>