Repository: cloudstack Updated Branches: refs/heads/master d08adef26 -> c66128994
Fix session expire handling If session has expired, hide entire UI (except for dialog) to prevent clicking/seeing expired UI elements. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/c6612899 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/c6612899 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/c6612899 Branch: refs/heads/master Commit: c661289941aa9ab34c0348dfd510b999865c42d8 Parents: d08adef Author: Brian Federle <brian.fede...@citrix.com> Authored: Wed Sep 17 13:31:39 2014 -0700 Committer: Brian Federle <brian.fede...@citrix.com> Committed: Wed Sep 17 13:31:39 2014 -0700 ---------------------------------------------------------------------- ui/scripts/sharedFunctions.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c6612899/ui/scripts/sharedFunctions.js ---------------------------------------------------------------------- diff --git a/ui/scripts/sharedFunctions.js b/ui/scripts/sharedFunctions.js index 41f5d3a..8fc0b72 100644 --- a/ui/scripts/sharedFunctions.js +++ b/ui/scripts/sharedFunctions.js @@ -845,10 +845,13 @@ var addGuestNetworkDialog = { var property; for (property in json) { var errorObj = json[property]; - if (errorObj.errorcode == 401 && errorObj.errortext == "unable to verify user credentials and/or request signature") + if (errorObj.errorcode == 401 && errorObj.errortext == "unable to verify user credentials and/or request signature") { + $('#container').hide(); + return _l('label.session.expired'); - else + } else { return _s(errorObj.errortext); + } } } else { return "";
