From 933f1213c1a2b297d45f971045eb57412d8aa35b Mon Sep 17 00:00:00 2001 From: Pranav Saxena Date: Tue, 26 Mar 2013 21:08:14 +0530 Subject: [PATCH 1/2] CLOUDSTACK-1724:ZWPS: provision to add scope of the primary storage in the zone creation wizard --- ui/scripts/zoneWizard.js | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/ui/scripts/zoneWizard.js b/ui/scripts/zoneWizard.js index 5108c5c0c3b..01dcaaf7e19 100755 --- a/ui/scripts/zoneWizard.js +++ b/ui/scripts/zoneWizard.js @@ -1177,6 +1177,24 @@ validation: { required: true } }, + scope: { + label: 'label.scope', + select: function(args) { + + var scope = [ + { id: 'zone', description: _l('label.zone.wide') }, + { id: 'cluster', description: _l('label.cluster') }, + { id: 'host', description: _l('label.host') } + ]; + + args.response.success({ + data: scope + }); + + } + + }, + protocol: { label: 'label.protocol', validation: { required: true }, @@ -3244,6 +3262,7 @@ array1.push("&podId=" + args.data.returnedPod.id); array1.push("&clusterid=" + args.data.returnedCluster.id); array1.push("&name=" + todb(args.data.primaryStorage.name)); + array1.push("&scope=" +todb(args.data.primaryStorage.scope)); var server = args.data.primaryStorage.server; var url = null; From 09d76fe0095e79f2234ab097285f843d98352fb9 Mon Sep 17 00:00:00 2001 From: Pranav Saxena Date: Tue, 26 Mar 2013 21:09:11 +0530 Subject: [PATCH 2/2] CLOUDSTACK-1724:ZWPS: provision to add scope of the primary storage in the zone creation wizard --- ui/scripts/zoneWizard.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/scripts/zoneWizard.js b/ui/scripts/zoneWizard.js index 01dcaaf7e19..753b0381f31 100755 --- a/ui/scripts/zoneWizard.js +++ b/ui/scripts/zoneWizard.js @@ -3262,7 +3262,7 @@ array1.push("&podId=" + args.data.returnedPod.id); array1.push("&clusterid=" + args.data.returnedCluster.id); array1.push("&name=" + todb(args.data.primaryStorage.name)); - array1.push("&scope=" +todb(args.data.primaryStorage.scope)); + array1.push("&scope=" + todb(args.data.primaryStorage.scope)); var server = args.data.primaryStorage.server; var url = null;