tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-07-29 16:54:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

js/history: no additional container at login

Browse Source 
History tries to load additional URLs separated by #! on page load. This
makes no sense on login page. However we need to preserve them when logging
in.

refs #6935
This commit is contained in:
Thomas Gelf 2014-08-19 09:22:10 +02:00
parent 4cfbb1f006
commit 3ccfbec53c
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -162,11 +162,18 @@
parts = document.location.hash.split(/#!/); parts = document.location.hash.split(/#!/);
if ($('#col2').data('icingaUrl') !== main) { if ($('#layout > #login').length) {
icinga.loader.loadUrl( // We are on the login page!
parts[1], $('#login form #redirect').val(
$('#col2') $('#login form #redirect').val() + '#!' + parts[1]
).historyTriggered = true; );
} else {
if ($('#col2').data('icingaUrl') !== main) {
icinga.loader.loadUrl(
parts[1],
$('#col2')
).historyTriggered = true;
}
} }
// TODO: Replace with dynamic columns // TODO: Replace with dynamic columns