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

Custom path handling corrections (Daniel Tuecks)

Browse Source
This commit is contained in:
Eric A. Miller
2013-11-14 20:37:47 -05:00
parent c12b54b181
commit 6bb2e3819f
3 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Netdisco/Changes
View File

@@ -23,6 +23,7 @@
* Default class of a PoE port is 0 if not otherwise defined * Default class of a PoE port is 0 if not otherwise defined
* Don't try to convert negative mW to dBm in AP power report * Don't try to convert negative mW to dBm in AP power report
* LDAP login fix (Daniel Tuecks) * LDAP login fix (Daniel Tuecks)
* Custom path handling corrections (Daniel Tuecks)
2.019003 - 2013-10-27 2.019003 - 2013-10-27

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

@@ -5,7 +5,7 @@ use Dancer::Plugin::DBIC;
use Dancer::Plugin::Auth::Extensible; use Dancer::Plugin::Auth::Extensible;
hook 'before' => sub { hook 'before' => sub {
params->{return_url} ||= '/inventory'; params->{return_url} ||= uri_for('/inventory');
if (! session('logged_in_user') && request->path ne uri_for('/login')->path) { if (! session('logged_in_user') && request->path ne uri_for('/login')->path) {
if (setting('trust_x_remote_user') and scalar request->header('X-REMOTE_USER')) { if (setting('trust_x_remote_user') and scalar request->header('X-REMOTE_USER')) {

2
Netdisco/share/views/js/common.js
View File

@@ -6,7 +6,7 @@
if (show.length) { if (show.length) {
$('#nd_csv-download') $('#nd_csv-download')
.attr('href', '/ajax/content/' + type + '/' + tab + '?' + query) .attr('href', uri_base + '/ajax/content/' + type + '/' + tab + '?' + query)
.attr('download', 'netdisco-' + type + '-' + tab + '.csv') .attr('download', 'netdisco-' + type + '-' + tab + '.csv')
.show(); .show();
} }