cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ke4...@apache.org
Subject [13/50] [abbrv] git commit: updated refs/heads/4.5 to 50ee981
Date Mon, 13 Oct 2014 04:41:30 GMT
CLOUDSTACK-7668: UI > When UI is loaded the first time, sometimes a blank screen instead
of a login screen shows. Only after clicking Refresh button(i.e. loaded again) will the login
screen show.

(cherry picked from commit 53d5e8af1833b7992b48638b7a63a918adf65aee)


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/a9761a3e
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/a9761a3e
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/a9761a3e

Branch: refs/heads/4.5
Commit: a9761a3eb3a7a7820b18499d5ecc900f4b526e21
Parents: 5f79fa3
Author: Jessica Wang <jessicawang@apache.org>
Authored: Thu Oct 2 14:43:10 2014 -0700
Committer: David Nalley <david@gnsa.us>
Committed: Mon Oct 13 00:26:35 2014 -0400

----------------------------------------------------------------------
 ui/scripts/cloudStack.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a9761a3e/ui/scripts/cloudStack.js
----------------------------------------------------------------------
diff --git a/ui/scripts/cloudStack.js b/ui/scripts/cloudStack.js
index a2e4dc2..ea6fc16 100644
--- a/ui/scripts/cloudStack.js
+++ b/ui/scripts/cloudStack.js
@@ -496,8 +496,9 @@
         }
         
         //added for dictionary split up
-        
-        $.extend(dictionary,dictionary2);
+        if (dictionary != undefined && dictionary2 != undefined) {
+            $.extend(dictionary,dictionary2);
+        }
 
         // Localize validation messages
         cloudStack.localizeValidatorMessages();


Mime
View raw message