Placed the Zone field at the top of the "create" window and "view" panel
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e02a9b2e Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e02a9b2e Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e02a9b2e Branch: refs/heads/sf-plugins Commit: e02a9b2e453566ca5f8e9b71968d067b2abb1c70 Parents: 1db663b Author: Mike Tutkowski <mike.tutkow...@solidfire.com> Authored: Wed Jul 15 21:53:43 2015 -0600 Committer: CloudStack <cloudstack@cloudstack-virtual-machine.(none)> Committed: Tue Jul 28 13:42:43 2015 -0600 ---------------------------------------------------------------------- ui/plugins/sfAdministration/sfAdministration.js | 54 ++++++++++---------- 1 file changed, 27 insertions(+), 27 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e02a9b2e/ui/plugins/sfAdministration/sfAdministration.js ---------------------------------------------------------------------- diff --git a/ui/plugins/sfAdministration/sfAdministration.js b/ui/plugins/sfAdministration/sfAdministration.js index 4c843ee..e16f0f5 100644 --- a/ui/plugins/sfAdministration/sfAdministration.js +++ b/ui/plugins/sfAdministration/sfAdministration.js @@ -59,6 +59,28 @@ title: 'Add Reference to Cluster', desc: 'Please fill in the following data to add a new reference to a cluster.', fields: { + availabilityZone: { + label: 'label.availability.zone', + docID: 'helpVolumeAvailabilityZone', + validation: { + required: true + }, + select: function(args) { + $.ajax({ + url: createURL("listZones&available=true"), + dataType: "json", + async: true, + success: function(json) { + var zoneObjs = json.listzonesresponse.zone; + + args.response.success({ + descriptionField: 'name', + data: zoneObjs + }); + } + }); + } + }, mvip: { label: 'MVIP', validation: { @@ -107,41 +129,19 @@ required: true, number: true } - }, - availabilityZone: { - label: 'label.availability.zone', - docID: 'helpVolumeAvailabilityZone', - validation: { - required: true - }, - select: function(args) { - $.ajax({ - url: createURL("listZones&available=true"), - dataType: "json", - async: true, - success: function(json) { - var zoneObjs = json.listzonesresponse.zone; - - args.response.success({ - descriptionField: 'name', - data: zoneObjs - }); - } - }); - } } } }, action: function(args) { var data = { + availabilityzone: args.data.availabilityzone, mvip: args.data.mvip, username: args.data.username, password: args.data.password, totalcapacity: args.data.totalcapacity, totalminiops: args.data.totalminiops, totalmaxiops: args.data.totalmaxiops, - totalburstiops: args.data.totalburstiops, - availabilityzone: args.data.availabilityzone + totalburstiops: args.data.totalburstiops }; $.ajax({ @@ -234,6 +234,9 @@ uuid: { label: 'label.id' }, + zonename: { + label: 'label.zone' + }, mvip: { label: 'MVIP' }, @@ -255,9 +258,6 @@ totalburstiops: { label: 'Total Burst IOPS', isEditable: true - }, - zonename: { - label: 'label.zone' } } ],
