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

Merge branch 'master' into em-device-ports-json

Browse Source
This commit is contained in:
Oliver Gorwits
2014-08-17 21:01:05 +01:00
parent febcec1865 c5caab6601
commit 60c8d8d7c1
7 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Netdisco/Changes
View File

@@ -1,9 +1,13 @@
2.029005 2.029005 - 2014-08-13
[ENHANCEMENTS] [ENHANCEMENTS]
* Custom portsort plug-in for DataTables * Custom portsort plug-in for DataTables
[BUG FIXES]
* Filter undefined entries from user log
2.029004 - 2014-08-11 2.029004 - 2014-08-11
[BUG FIXES] [BUG FIXES]

5
Netdisco/MANIFEST
View File

@@ -292,6 +292,7 @@ share/public/javascripts/moment.min.js
share/public/javascripts/natural.js share/public/javascripts/natural.js
share/public/javascripts/netdisco.js share/public/javascripts/netdisco.js
share/public/javascripts/netdisco_portcontrol.js share/public/javascripts/netdisco_portcontrol.js
share/public/javascripts/portsort.js
share/public/javascripts/toastr.js share/public/javascripts/toastr.js
share/public/javascripts/underscore.min.js share/public/javascripts/underscore.min.js
share/views/admintask.tt share/views/admintask.tt
@@ -395,3 +396,7 @@ share/views/sidebar/search/device.tt
share/views/sidebar/search/node.tt share/views/sidebar/search/node.tt
share/views/sidebar/search/port.tt share/views/sidebar/search/port.tt
t/10-sort_port.t t/10-sort_port.t
t/11-portsort.t
t/html/portsort.html
t/js/qunit-tap.js
t/js/run_qunit.js

5
Netdisco/META.yml
View File

@@ -3,7 +3,9 @@ abstract: 'An open source web-based network management tool.'
author: author:
- 'Oliver Gorwits <oliver@cpan.org>' - 'Oliver Gorwits <oliver@cpan.org>'
build_requires: build_requires:
Env::Path: 0
ExtUtils::MakeMaker: 6.59 ExtUtils::MakeMaker: 6.59
Test::More: 0.88
configure_requires: configure_requires:
ExtUtils::MakeMaker: 6.59 ExtUtils::MakeMaker: 6.59
distribution_type: module distribution_type: module
@@ -67,6 +69,7 @@ requires:
Sereal: 0 Sereal: 0
Socket6: 0.23 Socket6: 0.23
Starman: 0.4008 Starman: 0.4008
Sys::Proctitle: 0
Template: 2.24 Template: 2.24
Template::Plugin::CSV: 0.04 Template::Plugin::CSV: 0.04
Template::Plugin::Number::Format: 1.02 Template::Plugin::Number::Format: 1.02
@@ -86,4 +89,4 @@ resources:
homepage: http://netdisco.org/ homepage: http://netdisco.org/
license: http://opensource.org/licenses/bsd-license.php license: http://opensource.org/licenses/bsd-license.php
repository: git://git.code.sf.net/p/netdisco/netdisco-ng repository: git://git.code.sf.net/p/netdisco/netdisco-ng
version: 2.029004 version: 2.029005

3
Netdisco/Makefile.PL
View File

@@ -4,6 +4,9 @@ name 'App-Netdisco';
license 'bsd'; license 'bsd';
all_from 'lib/App/Netdisco.pm'; all_from 'lib/App/Netdisco.pm';
test_requires 'Test::More' => 0.88;
test_requires 'Env::Path' => 0;
requires 'Algorithm::Cron' => 0.07; requires 'Algorithm::Cron' => 0.07;
requires 'AnyEvent' => 7.05; requires 'AnyEvent' => 7.05;
requires 'AnyEvent::DNS::EtcHosts' => 0; requires 'AnyEvent::DNS::EtcHosts' => 0;

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

@@ -4,7 +4,7 @@ use strict;
use warnings; use warnings;
use 5.010_000; use 5.010_000;
our $VERSION = '2.029004'; our $VERSION = '2.029005';
use App::Netdisco::Configuration; use App::Netdisco::Configuration;
use Module::Find (); use Module::Find ();

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

@@ -69,12 +69,14 @@ ajax '/ajax/userlog' => require_login sub {
map {s/\[\]/&lt;empty&gt;/; $_} map {s/\[\]/&lt;empty&gt;/; $_}
map { $_->log } map { $_->log }
grep { $_->status eq 'done' } grep { $_->status eq 'done' }
grep { defined }
@jobs @jobs
], ],
'error' => [ 'error' => [
map {s/\[\]/&lt;empty&gt;/; $_} map {s/\[\]/&lt;empty&gt;/; $_}
map { $_->log } map { $_->log }
grep { $_->status eq 'error' } grep { $_->status eq 'error' }
grep { defined }
@jobs @jobs
], ],
); );

2
Netdisco/t/11-portsort.t
View File

@@ -9,7 +9,7 @@ use FindBin qw( $Bin );
my @phantomjs = Env::Path->PATH->Whence('phantomjs'); my @phantomjs = Env::Path->PATH->Whence('phantomjs');
my $phantomjs = scalar @phantomjs ? $phantomjs[0] : $ENV{ND_PHANTOMJS}; my $phantomjs = scalar @phantomjs ? $phantomjs[0] : $ENV{ND_PHANTOMJS};
if ( !-x $phantomjs ) { if ( ! defined $phantomjs or !-x $phantomjs ) {
plan skip_all => plan skip_all =>
"phantomjs not found, please set ND_PHANTOMJS or install phantomjs to the default location"; "phantomjs not found, please set ND_PHANTOMJS or install phantomjs to the default location";
} }