cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mtutkow...@apache.org
Subject [21/50] git commit: updated refs/heads/sf-plugins to 157efc3
Date Sat, 19 Sep 2015 01:31:27 GMT
Improvements to delete-volume logic


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

Branch: refs/heads/sf-plugins
Commit: 74ae95facdd93eb3bb7ddb70e051c923293ae154
Parents: cb933f2
Author: Mike Tutkowski <mike.tutkowski@solidfire.com>
Authored: Thu Jul 9 17:31:46 2015 -0600
Committer: Mike Tutkowski <mike.tutkowski@solidfire.com>
Committed: Fri Sep 18 19:28:20 2015 -0600

----------------------------------------------------------------------
 ui/plugins/sfSharedVolume/sfSharedVolume.js | 21 ++++++---------------
 1 file changed, 6 insertions(+), 15 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/74ae95fa/ui/plugins/sfSharedVolume/sfSharedVolume.js
----------------------------------------------------------------------
diff --git a/ui/plugins/sfSharedVolume/sfSharedVolume.js b/ui/plugins/sfSharedVolume/sfSharedVolume.js
index c37d9c3..b43b221 100644
--- a/ui/plugins/sfSharedVolume/sfSharedVolume.js
+++ b/ui/plugins/sfSharedVolume/sfSharedVolume.js
@@ -157,8 +157,8 @@
                   },
                   dependsOn: ['availabilityZone', 'account'],
                   select: function(args) {
-                    if (args.data.availabilityZone === null || args.data.availabilityZone
=== "" ||
-                        args.data.account === null || args.data.account === "") {
+                    if (args.data.availabilityZone == null || args.data.availabilityZone
== "" ||
+                        args.data.account == null || args.data.account == "") {
                       return;
                     }
 
@@ -214,31 +214,22 @@
         },
         detailView: {
           name: 'label.volume.details',
-          viewAll: {
-            path: 'storage.snapshots',
-            label: 'label.snapshots'
-          },
           actions: {
-            deleteVolume: {
+            remove: {
               label: 'Delete Shared Volume',
               messages: {
                 confirm: function(args) {
                   return 'Are you sure you would like to delete this shared volume?';
                 },
                 notification: function(args) {
-                  return 'Shared volume deleted';
+                  return 'Delete Shared Volume';
                 }
               },
               action: function(args) {
                 $.ajax({
-                  url: createURL('deleteSolidFireVolume'),
-                  data: data,
+                  url: createURL('deleteSolidFireVolume&id=' + args.context.sfSharedVolumes[0].id),
                   success: function(json) {
-                    var sfvolumeObj = json.deletesolidfirevolumeresponse.apideletesolidfirevolume;
-
-                    args.response.success({
-                      data: sfvolumeObj
-                    });
+                    args.response.success();
                   },
                   error: function(json) {
                     args.response.error(parseXMLHttpResponse(json));


Mime
View raw message