tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix that the detail URL is no longer appended to the redirect URL on login 

JavaScript relied on #redirect but we now protect IDs which make them unusable
for JS and CSS.

refs #8728
This commit is contained in:
Eric Lippmann 2015-03-13 03:48:46 +01:00
parent 32487e4e21
commit b5abff0313
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
public/js/icinga/history.js
View File

@ -112,7 +112,7 @@
this.lastPushUrl = url; this.lastPushUrl = url;
window.history.pushState({icinga: true}, null, url); window.history.pushState({icinga: true}, null, url);
}, },
/** /**
* Event handler for pop events * Event handler for pop events
* *
@ -166,9 +166,10 @@
parts = document.location.hash.split(/#!/); parts = document.location.hash.split(/#!/);
if ($('#layout > #login').length) { if ($('#layout > #login').length) {
// We are on the login page! // We are on the login page
$('#login form #redirect').val( var redirect = $('#login form input[name=redirect]').first();
$('#login form #redirect').val() + '#!' + parts[1] redirect.val(
redirect.val() + '#!' + parts[1]
); );
} else { } else {
if ($('#col2').data('icingaUrl') !== main) { if ($('#col2').data('icingaUrl') !== main) {