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 7B0EA111B9 for ; Mon, 9 Jun 2014 18:42:28 +0000 (UTC) Received: (qmail 44968 invoked by uid 500); 9 Jun 2014 18:42:28 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 44943 invoked by uid 500); 9 Jun 2014 18:42:28 -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 44935 invoked by uid 99); 9 Jun 2014 18:42:28 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 09 Jun 2014 18:42:28 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 21D3E9011B9; Mon, 9 Jun 2014 18:42:28 +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/4.4-forward to 1641b28 Date: Mon, 9 Jun 2014 18:42:28 +0000 (UTC) Repository: cloudstack Updated Branches: refs/heads/4.4-forward 89a03c709 -> 1641b2805 CLOUDSTACK-6852: UI - modules - add DR fields to volume detailView, network detailView, zone detailView. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/1641b280 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/1641b280 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/1641b280 Branch: refs/heads/4.4-forward Commit: 1641b280544e1982f155f82b17d56d0f6ec82e6a Parents: 89a03c7 Author: Jessica Wang Authored: Mon Jun 9 11:38:34 2014 -0700 Committer: Jessica Wang Committed: Mon Jun 9 11:42:13 2014 -0700 ---------------------------------------------------------------------- ui/scripts/network.js | 4 ++++ ui/scripts/storage.js | 4 ++++ ui/scripts/system.js | 7 +++++++ 3 files changed, 15 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1641b280/ui/scripts/network.js ---------------------------------------------------------------------- diff --git a/ui/scripts/network.js b/ui/scripts/network.js index 9d5fb79..4772c34 100755 --- a/ui/scripts/network.js +++ b/ui/scripts/network.js @@ -1383,6 +1383,10 @@ success: function(json) { var jsonObj = json.listnetworksresponse.network[0]; addExtraPropertiesToGuestNetworkObject(jsonObj); + + //if DR module is included + addExtraPropertiesIfDrModuleIncluded(jsonObj, "Network"); + args.response.success({ actionFilter: cloudStack.actionFilter.guestNetwork, data: jsonObj http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1641b280/ui/scripts/storage.js ---------------------------------------------------------------------- diff --git a/ui/scripts/storage.js b/ui/scripts/storage.js index 7ee475f..604f09d 100644 --- a/ui/scripts/storage.js +++ b/ui/scripts/storage.js @@ -1494,6 +1494,10 @@ async: true, success: function(json) { var jsonObj = json.listvolumesresponse.volume[0]; + + //if DR module is included + addExtraPropertiesIfDrModuleIncluded(jsonObj, "Volume"); + args.response.success({ actionFilter: volumeActionfilter, data: jsonObj http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1641b280/ui/scripts/system.js ---------------------------------------------------------------------- diff --git a/ui/scripts/system.js b/ui/scripts/system.js index 67e01f1..156be7a 100644 --- a/ui/scripts/system.js +++ b/ui/scripts/system.js @@ -1954,6 +1954,10 @@ success: function (json) { selectedGuestNetworkObj = json.listnetworksresponse.network[0]; addExtraPropertiesToGuestNetworkObject(selectedGuestNetworkObj); + + //if DR module is included + addExtraPropertiesIfDrModuleIncluded(selectedGuestNetworkObj, "Network"); + args.response.success({ actionFilter: cloudStack.actionFilter.guestNetwork, data: selectedGuestNetworkObj @@ -7591,6 +7595,9 @@ //override default error handling: cloudStack.dialog.notice({ message: parseXMLHttpResponse(XMLHttpResponse)}); }); + //if DR module is included + addExtraPropertiesIfDrModuleIncluded(selectedZoneObj, "Zone"); + args.response.success({ actionFilter: zoneActionfilter, data: selectedZoneObj