cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mtutkow...@apache.org
Subject [28/50] git commit: updated refs/heads/sf-plugins to 157efc3
Date Sat, 19 Sep 2015 01:31:34 GMT
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/6795be5f
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/6795be5f
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/6795be5f

Branch: refs/heads/sf-plugins
Commit: 6795be5f6d97d16696ad053db72c5ea8e6280fc9
Parents: 9a0e7b9
Author: Mike Tutkowski <mike.tutkowski@solidfire.com>
Authored: Wed Jul 15 21:53:43 2015 -0600
Committer: Mike Tutkowski <mike.tutkowski@solidfire.com>
Committed: Fri Sep 18 19:28:21 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/6795be5f/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'
                   }
                 }
               ],


Mime
View raw message