From c20f467aee02291b2aa14e2af2a1931d02b0de74 Mon Sep 17 00:00:00 2001 From: Jessica Wang Date: Wed, 14 Dec 2011 13:03:20 -0800 Subject: [PATCH] bug 10409: edit zone - make domain suffix field editable. --- ui/scripts/system.js | 27 ++++++++++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) diff --git a/ui/scripts/system.js b/ui/scripts/system.js index 32e006284d6..a3d4b7ac3b7 100644 --- a/ui/scripts/system.js +++ b/ui/scripts/system.js @@ -312,7 +312,25 @@ }, 'management': { detailView: { - viewAll: { path: '_zone.pods', label: 'Pods' }, + viewAll: { path: '_zone.pods', label: 'Pods' }, + actions: { + edit: { + label: 'Edit', + action: function(args) { + var array1 = []; + array1.push("&domain=" + todb(args.data.domain)); + $.ajax({ + url: createURL("updateZone&id=" + args.context.zones[0].id + array1.join("")), + dataType: "json", + async: false, + success: function(json) { + selectedZoneObj = json.updatezoneresponse.zone; //override selectedZoneObj after update zone + args.response.success({data: selectedZoneObj}); + } + }); + } + } + }, tabs: { details: { title: 'Details', @@ -332,7 +350,10 @@ label: 'Security Groups Enabled', converter:cloudStack.converters.toBooleanText }, - domain: { label: 'Domain' }, + domain: { + label: 'Domain', + isEditable: true + }, //only advanced zones have VLAN and CIDR Address guestcidraddress: { label: 'Guest CIDR Address', isEditable: true }, @@ -929,7 +950,7 @@ //args.data.networkofferingid is null when networkofferingid field is hidden if(args.data.networkofferingid != null && args.data.networkofferingid != selectedGuestNetworkObj.networkofferingid) - array1.push("&networkofferingid=" + todb(args.data.networkofferingid)); //??? + array1.push("&networkofferingid=" + todb(args.data.networkofferingid)); //args.data.networkdomain is null when networkdomain field is hidden if(args.data.networkdomain != null && args.data.networkdomain != selectedGuestNetworkObj.networkdomain)