diff options
| author | Robert Zorko <robertz@gurucue.com> | 2015-10-16 10:32:17 +0200 |
|---|---|---|
| committer | Robert Zorko <robertz@gurucue.com> | 2015-10-16 10:32:17 +0200 |
| commit | e5f4844fa6306aab17c15595c2da411d879ffa48 (patch) | |
| tree | acc9cbff21d918f704180c39473a106635098e22 | |
| parent | 5c1819eb694131b4503c7b95e0f4e47facab798a (diff) | |
added a transition to the original login state if the saml login fails
| -rw-r--r-- | js/codeq/aaiLogin.js | 1 | ||||
| -rw-r--r-- | js/codeq/settings.js | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/js/codeq/aaiLogin.js b/js/codeq/aaiLogin.js index 74a9ee4..2e49138 100644 --- a/js/codeq/aaiLogin.js +++ b/js/codeq/aaiLogin.js @@ -36,6 +36,7 @@ .fail(function(reason){ codeq.log.error('SAML login failed: ' + reason); alert('SAML login failed: ' + reason); + codeq.globalStateMachine.transition('login'); }) .done(); diff --git a/js/codeq/settings.js b/js/codeq/settings.js index 1c15ad0..8207c3f 100644 --- a/js/codeq/settings.js +++ b/js/codeq/settings.js @@ -15,7 +15,7 @@ jqDisabledOverlay.css('display', ''); robotAddressInput.val(codeq.settings['robot_address']);//set the robot address once we enter the state var previousGuiLang = codeq.settings['gui_lang']; - jqSettForm.on("submit", function() { + jqSettForm.on("submit", function(e) { codeq.settings['robot_address'] = robotAddressInput.val(); codeq.comms.updateSettings(codeq.settings) .then(function (data) { @@ -25,7 +25,7 @@ }) .done(); history.back(); - return false; + e.preventDefault(); }); jqSettCancelBtn.on("click",function(){ guiLangSelect.val(previousGuiLang); |