You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by je...@apache.org on 2014/01/09 20:22:56 UTC
git commit: updated refs/heads/4.3 to 644a9bc
Updated Branches:
refs/heads/4.3 072581b09 -> 644a9bc53
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/644a9bc5
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/644a9bc5
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/644a9bc5
Branch: refs/heads/4.3
Commit: 644a9bc5323317bd70616ba47fa53be98a9950ad
Parents: 072581b
Author: Jessica Wang <je...@citrix.com>
Authored: Thu Jan 9 11:22:06 2014 -0800
Committer: Jessica Wang <je...@citrix.com>
Committed: Thu Jan 9 11:22:06 2014 -0800
----------------------------------------------------------------------
ui/scripts/system.js | 40 ++------------------------------
ui/scripts/ui/widgets/detailView.js | 8 +------
2 files changed, 3 insertions(+), 45 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/644a9bc5/ui/scripts/system.js
----------------------------------------------------------------------
diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index a5f6ffe..8558de9 100644
--- a/ui/scripts/system.js
+++ b/ui/scripts/system.js
@@ -16145,38 +16145,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: {
@@ -17687,12 +17656,7 @@
var secondarystorageActionfilter = function(args) {
var jsonObj = args.context.item;
var allowedActions = [];
- allowedActions.push("remove");
-
- if (jsonObj.providername == 'NFS') {
- allowedActions.push("prepareObjectStoreMigration");
- }
-
+ allowedActions.push("remove");
return allowedActions;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/644a9bc5/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;