cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jessicaw...@apache.org
Subject git commit: updated refs/heads/master to 7e8d199
Date Tue, 04 Jun 2013 21:22:54 GMT
Updated Branches:
  refs/heads/master 55148d90a -> 7e8d19963


CLOUDSTACK-2842: UI - fix a JS error "elems is undefined" when popping up a dialog box that
has zone dropdown and there is no zone created yet.


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

Branch: refs/heads/master
Commit: 7e8d19963d66e64219c512193e566944cc560c2d
Parents: 55148d9
Author: Jessica Wang <jessicawang@apache.org>
Authored: Tue Jun 4 14:21:59 2013 -0700
Committer: Jessica Wang <jessicawang@apache.org>
Committed: Tue Jun 4 14:22:47 2013 -0700

----------------------------------------------------------------------
 ui/scripts/instances.js |    2 +-
 ui/scripts/network.js   |    6 +++---
 ui/scripts/storage.js   |    2 +-
 ui/scripts/system.js    |   10 +++++-----
 ui/scripts/templates.js |    4 ++--
 5 files changed, 12 insertions(+), 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7e8d1996/ui/scripts/instances.js
----------------------------------------------------------------------
diff --git a/ui/scripts/instances.js b/ui/scripts/instances.js
index 6a589ba..29e4ac3 100644
--- a/ui/scripts/instances.js
+++ b/ui/scripts/instances.js
@@ -70,7 +70,7 @@
 								listAll: true
 							},
 							success: function(json) {
-								var zones = json.listzonesresponse.zone;
+								var zones = json.listzonesresponse.zone ? json.listzonesresponse.zone : [];
 
 								args.response.success({
 									data: $.map(zones, function(zone) {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7e8d1996/ui/scripts/network.js
----------------------------------------------------------------------
diff --git a/ui/scripts/network.js b/ui/scripts/network.js
index 0eb17c9..8d92b17 100755
--- a/ui/scripts/network.js
+++ b/ui/scripts/network.js
@@ -558,7 +558,7 @@
 									  listAll: true
 									},
 									success: function(json) {									  
-										var zones = json.listzonesresponse.zone;
+										var zones = json.listzonesresponse.zone ? json.listzonesresponse.zone : [];
 
 										args.response.success({
 											data: $.map(zones, function(zone) {
@@ -4394,7 +4394,7 @@
 									  listAll: true
 									},
 									success: function(json) {									  
-										var zones = json.listzonesresponse.zone;
+										var zones = json.listzonesresponse.zone ? json.listzonesresponse.zone : [];
 
 										args.response.success({
 											data: $.map(zones, function(zone) {
@@ -4509,7 +4509,7 @@
                         url: createURL('listZones'),
                         data: data,
                         success: function(json) {
-                          var zones = json.listzonesresponse.zone;
+                          var zones = json.listzonesresponse.zone ? json.listzonesresponse.zone
: [];
                           var advZones = $.grep(zones, function(zone) {
                             return zone.networktype == 'Advanced' && ! zone.securitygroupsenabled;
                           });

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7e8d1996/ui/scripts/storage.js
----------------------------------------------------------------------
diff --git a/ui/scripts/storage.js b/ui/scripts/storage.js
index e816334..2c03d39 100644
--- a/ui/scripts/storage.js
+++ b/ui/scripts/storage.js
@@ -299,7 +299,7 @@
 									  listAll: true
 									},
 									success: function(json) {									  
-										var zones = json.listzonesresponse.zone;
+										var zones = json.listzonesresponse.zone ? json.listzonesresponse.zone : [];
 
 										args.response.success({
 											data: $.map(zones, function(zone) {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7e8d1996/ui/scripts/system.js
----------------------------------------------------------------------
diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index 283c7df..bb197c4 100644
--- a/ui/scripts/system.js
+++ b/ui/scripts/system.js
@@ -8708,7 +8708,7 @@
                         url: createURL('listZones'),
                         data: data,
                         success: function(json) {
-                          var zones = json.listzonesresponse.zone;
+                          var zones = json.listzonesresponse.zone ? json.listzonesresponse.zone
: [];
 
                           args.response.success({
                             data: $.map(zones, function(zone) {
@@ -9303,7 +9303,7 @@
                         url: createURL('listZones'),
                         data: data,
                         success: function(json) {
-                          var zones = json.listzonesresponse.zone;
+                          var zones = json.listzonesresponse.zone ? json.listzonesresponse.zone
: [];
 
                           args.response.success({
                             data: $.map(zones, function(zone) {
@@ -10504,7 +10504,7 @@
                         url: createURL('listZones'),
                         data: data,
                         success: function(json) {
-                          var zones = json.listzonesresponse.zone;
+                          var zones = json.listzonesresponse.zone ? json.listzonesresponse.zone
: [];
 
                           args.response.success({
                             data: $.map(zones, function(zone) {
@@ -11503,7 +11503,7 @@
                         url: createURL('listZones'),
                         data: data,
                         success: function(json) {
-                          var zones = json.listzonesresponse.zone;
+                          var zones = json.listzonesresponse.zone ? json.listzonesresponse.zone
: [];
 
                           args.response.success({
                             data: $.map(zones, function(zone) {
@@ -12417,7 +12417,7 @@
                         url: createURL('listZones'),
                         data: data,
                         success: function(json) {
-                          var zones = json.listzonesresponse.zone;
+                          var zones = json.listzonesresponse.zone ? json.listzonesresponse.zone
: [];
 
                           args.response.success({
                             data: $.map(zones, function(zone) {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7e8d1996/ui/scripts/templates.js
----------------------------------------------------------------------
diff --git a/ui/scripts/templates.js b/ui/scripts/templates.js
index 91038b9..b78a94d 100644
--- a/ui/scripts/templates.js
+++ b/ui/scripts/templates.js
@@ -60,7 +60,7 @@
 									  listAll: true
 									},
 									success: function(json) {									  
-										var zones = json.listzonesresponse.zone;
+										var zones = json.listzonesresponse.zone ? json.listzonesresponse.zone : [];
 
 										args.response.success({
 											data: $.map(zones, function(zone) {
@@ -1006,7 +1006,7 @@
 									  listAll: true
 									},
 									success: function(json) {									  
-										var zones = json.listzonesresponse.zone;
+										var zones = json.listzonesresponse.zone ? json.listzonesresponse.zone : [];
 
 										args.response.success({
 											data: $.map(zones, function(zone) {


Mime
View raw message