cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jessicaw...@apache.org
Subject git commit: updated refs/heads/master to a2b3e3a
Date Fri, 10 Jan 2014 18:45:54 GMT
Updated Branches:
  refs/heads/master 5bf78b82c -> a2b3e3a60


CLOUDSTACK-5840: UI > Secondary Storages > remove "prepareObjectStoreMigration" action
(since prepareSecondaryStorageForMigration API has been removed from server-side).


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

Branch: refs/heads/master
Commit: a2b3e3a60d138f78934f07d18c152c9d5fc3667a
Parents: 5bf78b8
Author: Jessica Wang <jessica.wang@citrix.com>
Authored: Thu Jan 9 11:22:06 2014 -0800
Committer: Jessica Wang <jessicawang@apache.org>
Committed: Fri Jan 10 10:45:19 2014 -0800

----------------------------------------------------------------------
 ui/scripts/system.js                | 42 +++-----------------------------
 ui/scripts/ui/widgets/detailView.js |  8 +-----
 2 files changed, 4 insertions(+), 46 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a2b3e3a6/ui/scripts/system.js
----------------------------------------------------------------------
diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index 4b4acb6..1477d69 100644
--- a/ui/scripts/system.js
+++ b/ui/scripts/system.js
@@ -17051,38 +17051,7 @@
                             detailView: {
                                 name: 'Secondary storage details',
                                 isMaximized: true,
-                                actions: {
-                                    prepareObjectStoreMigration: {
-                                        label: 'Prepare Object Store Migration',
-                                        messages: {
-                                            confirm: function (args) {
-                                                return 'Please confirm you want to prepare
migration of secondary storage to object store.';
-                                            },
-                                            notification: function (args) {
-                                                return 'Prepare Object Store Migration';
-                                            }
-                                        },
-                                        action: function (args) {
-                                            $.ajax({
-                                                url: createURL('prepareSecondaryStorageForMigration'),
-                                                data: {
-                                                    id: args.context.secondaryStorage[0].id
-                                                },
-                                                success: function (json) {
-                                                    var jid = json.preparesecondarystorageformigrationresponse.jobid;
-                                                    args.response.success({
-                                                        _custom: {
-                                                            jobId: jid
-                                                        }
-                                                    });
-                                                }
-                                            });
-                                        },
-                                        notification: {
-                                            poll: pollAsyncJobResult
-                                        }
-                                    },
-                                    
+                                actions: { 
                                     remove: {
                                         label: 'label.action.delete.secondary.storage',
                                         messages: {
@@ -18621,13 +18590,8 @@
     
     var secondarystorageActionfilter = function (args) {
         var jsonObj = args.context.item;
-        var allowedActions =[];
-        allowedActions.push("remove");
-        
-        if (jsonObj.providername == 'NFS') {
-            allowedActions.push("prepareObjectStoreMigration");
-        }
-        
+        var allowedActions = [];
+        allowedActions.push("remove");  
         return allowedActions;
     }
     

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a2b3e3a6/ui/scripts/ui/widgets/detailView.js
----------------------------------------------------------------------
diff --git a/ui/scripts/ui/widgets/detailView.js b/ui/scripts/ui/widgets/detailView.js
index d29f32e..9ca4ddd 100644
--- a/ui/scripts/ui/widgets/detailView.js
+++ b/ui/scripts/ui/widgets/detailView.js
@@ -380,13 +380,7 @@
                 }
             });
         },
-
-        prepareObjectStoreMigration: function($detailView, args) {        	
-            var tab = args.tabs[args.activeTab];
-            var isMultiple = tab.multiple;
-            uiActions.remove($detailView, args);
-        },            
-               
+            
         destroy: function($detailView, args) {
             var tab = args.tabs[args.activeTab];
             var isMultiple = tab.multiple;


Mime
View raw message