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 b040bf2
Date Sat, 10 Aug 2013 01:50:26 GMT
Updated Branches:
  refs/heads/master 71af0db66 -> b040bf224


CLOUDSTACK-4189: UI > Infrastructure > zone > dedicatedZone object is different from
zone object. Fix a bug that they were wrongly presumed to be the same object and wrongly mixed
which caused zone object's properties being wrongly overriden.


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

Branch: refs/heads/master
Commit: b040bf224bacc0434671df062fa1e86d0ec880da
Parents: 71af0db
Author: Jessica Wang <jessicawang@apache.org>
Authored: Fri Aug 9 18:45:47 2013 -0700
Committer: Jessica Wang <jessicawang@apache.org>
Committed: Fri Aug 9 18:50:17 2013 -0700

----------------------------------------------------------------------
 ui/scripts/system.js | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b040bf22/ui/scripts/system.js
----------------------------------------------------------------------
diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index f4bee5a..3512958 100644
--- a/ui/scripts/system.js
+++ b/ui/scripts/system.js
@@ -6256,20 +6256,26 @@
                                                 success: function(json) {
                                                     selectedZoneObj = json.listzonesresponse.zone[0];
                                                     $.ajax({
-                                                        url: createURL("listDedicatedZones&zoneid="
+ args.context.physicalResources[0].id),
-                                                        dataType: "json",
+                                                        url: createURL('listDedicatedZones'),
+                                                        data: {
+                                                        	zoneid: args.context.physicalResources[0].id
+                                                        },
                                                         async: false,
-                                                        success: function(json) {
+                                                        success: function(json) {       
                                               
                                                             if (json.listdedicatedzonesresponse.dedicatedzone
!= undefined) {
-                                                                var zoneItem = json.listdedicatedzonesresponse.dedicatedzone[0];
-                                                                if (zoneItem.domainid !=
null) {
-                                                                    $.extend(selectedZoneObj,
zoneItem, {
-                                                                        isdedicated: 'Yes'
+                                                                var dedicatedzoneObj = json.listdedicatedzonesresponse.dedicatedzone[0];
+                                                                if (dedicatedzoneObj.domainid
!= null) {
+                                                                    $.extend(selectedZoneObj,
{
+                                                                        isdedicated: 'Yes',
+                                                                        domainid: dedicatedzoneObj.domainid,
+                                                                        accountid: dedicatedzoneObj.accountid
                                                                     });
                                                                 }
                                                             } else {
                                                                 $.extend(selectedZoneObj,
{
-                                                                    isdedicated: 'No'
+                                                                    isdedicated: 'No',
+                                                                    domainid: null,
+                                                                    accountid: null
                                                                 })
                                                             }
                                                         }


Mime
View raw message