From 3ccfbec53c5112642dfe1131e94752dde038c2b5 Mon Sep 17 00:00:00 2001 From: Thomas Gelf Date: Tue, 19 Aug 2014 09:22:10 +0200 Subject: [PATCH] js/history: no additional container at login 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 --- public/js/icinga/history.js | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/public/js/icinga/history.js b/public/js/icinga/history.js index dded86379..a3fcf5deb 100644 --- a/public/js/icinga/history.js +++ b/public/js/icinga/history.js @@ -162,11 +162,18 @@ parts = document.location.hash.split(/#!/); - if ($('#col2').data('icingaUrl') !== main) { - icinga.loader.loadUrl( - parts[1], - $('#col2') - ).historyTriggered = true; + if ($('#layout > #login').length) { + // We are on the login page! + $('#login form #redirect').val( + $('#login form #redirect').val() + '#!' + parts[1] + ); + } else { + if ($('#col2').data('icingaUrl') !== main) { + icinga.loader.loadUrl( + parts[1], + $('#col2') + ).historyTriggered = true; + } } // TODO: Replace with dynamic columns