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 2013/05/07 20:39:46 UTC
git commit: updated refs/heads/object_store to d9733e9
Updated Branches:
refs/heads/object_store 79935f6ee -> d9733e900
CLOUDSTACK-2351: object store - UI - infrastructure menu - secondary storages - detailView - delete action - replace deleteHost API with new API deleteImageStore.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/d9733e90
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/d9733e90
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/d9733e90
Branch: refs/heads/object_store
Commit: d9733e900dbfa73035adaf4194978218727ffbc3
Parents: 79935f6
Author: Jessica Wang <je...@apache.org>
Authored: Tue May 7 11:38:31 2013 -0700
Committer: Jessica Wang <je...@apache.org>
Committed: Tue May 7 11:38:31 2013 -0700
----------------------------------------------------------------------
ui/scripts/system.js | 34 ++++++++--------------------------
1 files changed, 8 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d9733e90/ui/scripts/system.js
----------------------------------------------------------------------
diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index 0ecd935..abf41a9 100644
--- a/ui/scripts/system.js
+++ b/ui/scripts/system.js
@@ -224,16 +224,7 @@
dataFns.hostCount($.extend(data, {
clusterCount: json.listclustersresponse.count ?
json.listclustersresponse.count : 0
- }));
-
- //comment the 4 lines above and uncomment the following 4 lines if listHosts API still responds slowly.
-
- /*
- dataFns.primaryStorageCount($.extend(data, {
- clusterCount: json.listclustersresponse.count ?
- json.listclustersresponse.count : 0
- }));
- */
+ }));
}
});
},
@@ -266,16 +257,7 @@
dataFns.secondaryStorageCount($.extend(data, {
primaryStorageCount: json.liststoragepoolsresponse.count ?
json.liststoragepoolsresponse.count : 0
- }));
-
- //comment the 4 lines above and uncomment the following 4 lines if listHosts API still responds slowly.
-
- /*
- dataFns.systemVmCount($.extend(data, {
- primaryStorageCount: json.liststoragepoolsresponse.count ?
- json.liststoragepoolsresponse.count : 0
- }));
- */
+ }));
}
});
},
@@ -9282,8 +9264,7 @@
url: createURL("deleteHost&id=" + args.context.hosts[0].id + array1.join("")),
dataType: "json",
async: true,
- success: function(json) {
- //{ "deletehostresponse" : { "success" : "true"} }
+ success: function(json) {
args.response.success({data:{}});
}
});
@@ -10651,9 +10632,10 @@
},
action: function(args) {
$.ajax({
- url: createURL("deleteHost&id=" + args.context.secondarystorages[0].id),
- dataType: "json",
- async: true,
+ url: createURL('deleteImageStore'),
+ data: {
+ id: args.context.secondarystorages[0].id
+ },
success: function(json) {
args.response.success();
}
@@ -10681,7 +10663,7 @@
dataProvider: function(args) {
$.ajax({
- url: createURL("listImageStores&type=image&id=" + args.context.secondarystorages[0].id),
+ url: createURL("listImageStores&id=" + args.context.secondarystorages[0].id),
dataType: "json",
async: true,
success: function(json) {