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 AFB5817E17 for ; Fri, 24 Oct 2014 00:00:42 +0000 (UTC) Received: (qmail 93857 invoked by uid 500); 24 Oct 2014 00:00:42 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 93823 invoked by uid 500); 24 Oct 2014 00:00:42 -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 93809 invoked by uid 99); 24 Oct 2014 00:00:42 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 24 Oct 2014 00:00:42 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 326131FFD6; Fri, 24 Oct 2014 00:00:42 +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: X-Mailer: ASF-Git Admin Mailer Subject: git commit: updated refs/heads/master to 1cb218a Date: Fri, 24 Oct 2014 00:00:42 +0000 (UTC) Repository: cloudstack Updated Branches: refs/heads/master 3ccca7873 -> 1cb218ad6 CLOUDSTACK-7780: UI > storage > volume > detail view > data provider > remove unnecessary module check. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/1cb218ad Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/1cb218ad Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/1cb218ad Branch: refs/heads/master Commit: 1cb218ad6321dda6e745ae4a35e0a75fc4c80469 Parents: 3ccca78 Author: Jessica Wang Authored: Thu Oct 23 16:58:42 2014 -0700 Committer: Jessica Wang Committed: Thu Oct 23 17:00:31 2014 -0700 ---------------------------------------------------------------------- ui/scripts/storage.js | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1cb218ad/ui/scripts/storage.js ---------------------------------------------------------------------- diff --git a/ui/scripts/storage.js b/ui/scripts/storage.js index cc538f8..90720ac 100644 --- a/ui/scripts/storage.js +++ b/ui/scripts/storage.js @@ -1531,12 +1531,7 @@ dataType: "json", async: true, success: function(json) { - var jsonObj = json.listvolumesresponse.volume[0]; - - if (isModuleIncluded("dr")) { - cloudStack.dr.sharedFunctions.addExtraProperties(jsonObj, "Volume"); - } - + var jsonObj = json.listvolumesresponse.volume[0]; args.response.success({ actionFilter: volumeActionfilter, data: jsonObj