cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bfede...@apache.org
Subject [33/50] git commit: updated refs/heads/ui-restyle to 06ccb84
Date Fri, 15 Nov 2013 20:03:18 GMT
CLOUDSTACK-3154: UI > zone detail > remove VMware data center action > if API returns
error, stop spinning wheel and show returned error text in a pop up dialog.


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

Branch: refs/heads/ui-restyle
Commit: 5e2e27dea679ec8abc5c3d54c735db30c531830a
Parents: 9fc81f0
Author: Jessica Wang <jessicawang@apache.org>
Authored: Thu Nov 14 14:35:49 2013 -0800
Committer: Jessica Wang <jessicawang@apache.org>
Committed: Thu Nov 14 14:38:54 2013 -0800

----------------------------------------------------------------------
 ui/scripts/system.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5e2e27de/ui/scripts/system.js
----------------------------------------------------------------------
diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index 6062135..a211a7f 100644
--- a/ui/scripts/system.js
+++ b/ui/scripts/system.js
@@ -6061,6 +6061,10 @@
                                                     args.response.success({             
                                          
                                                         data: args.context.physicalResources[0]
                                                     });
+                                                },
+                                                error: function(XMLHttpResponse) {
+                                                    var errorMsg = parseXMLHttpResponse(XMLHttpResponse);
+                                                    args.response.error(errorMsg);
                                                 }
                                             });
                                         },
@@ -16956,7 +16960,7 @@
     var zoneActionfilter = function(args) {
         var jsonObj = args.context.item;
         var allowedActions = ['enableSwift'];
-
+       
         if (jsonObj.vmwaredcId == null)
             allowedActions.push('addVmwareDc');
         else


Mime
View raw message