You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by da...@apache.org on 2014/07/28 16:04:24 UTC
[12/50] git commit: updated refs/heads/4.4 to d5220a8
CLOUDSTACK-6852: UI - modules - add DR fields to volume detailView, network detailView, zone detailView.
(cherry picked from commit 1641b280544e1982f155f82b17d56d0f6ec82e6a)
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/dfb4d909
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/dfb4d909
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/dfb4d909
Branch: refs/heads/4.4
Commit: dfb4d9093722658e9528566ddc7f3086ee190c05
Parents: 6519a46
Author: Jessica Wang <je...@apache.org>
Authored: Mon Jun 9 11:38:34 2014 -0700
Committer: Daan Hoogland <da...@onecht.net>
Committed: Mon Jul 28 16:02:28 2014 +0200
----------------------------------------------------------------------
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/dfb4d909/ui/scripts/network.js
----------------------------------------------------------------------
diff --git a/ui/scripts/network.js b/ui/scripts/network.js
index f934f21..1e0dc3c 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/dfb4d909/ui/scripts/storage.js
----------------------------------------------------------------------
diff --git a/ui/scripts/storage.js b/ui/scripts/storage.js
index 5a0580b..0a2d1dc 100644
--- a/ui/scripts/storage.js
+++ b/ui/scripts/storage.js
@@ -1498,6 +1498,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/dfb4d909/ui/scripts/system.js
----------------------------------------------------------------------
diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index 1bcbcbb..f2fda08 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