Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id C1B3A10F46 for ; Tue, 7 May 2013 18:39:46 +0000 (UTC) Received: (qmail 29717 invoked by uid 500); 7 May 2013 18:39:46 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 29682 invoked by uid 500); 7 May 2013 18:39:46 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 29675 invoked by uid 99); 7 May 2013 18:39:46 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 07 May 2013 18:39:46 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 3BCFA888B58; Tue, 7 May 2013 18:39:46 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jessicawang@apache.org To: commits@cloudstack.apache.org Message-Id: <2c73ece47f884a80bb5f2e170e3f1b79@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: updated refs/heads/object_store to d9733e9 Date: Tue, 7 May 2013 18:39:46 +0000 (UTC) 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 Authored: Tue May 7 11:38:31 2013 -0700 Committer: Jessica Wang 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) {