From 044c5e0eeef3211a4418c1251f23f1e91499316e Mon Sep 17 00:00:00 2001 From: Jessica Wang Date: Mon, 9 Jun 2014 11:38:34 -0700 Subject: [PATCH] CLOUDSTACK-6852: UI - modules - add DR fields to volume detailView, network detailView, zone detailView. --- ui/scripts/network.js | 4 ++++ ui/scripts/storage.js | 4 ++++ ui/scripts/system.js | 7 +++++++ 3 files changed, 15 insertions(+) diff --git a/ui/scripts/network.js b/ui/scripts/network.js index 9d5fb79b3c9..4772c34564b 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 diff --git a/ui/scripts/storage.js b/ui/scripts/storage.js index 6f354521794..45890b08443 100644 --- a/ui/scripts/storage.js +++ b/ui/scripts/storage.js @@ -1497,6 +1497,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 diff --git a/ui/scripts/system.js b/ui/scripts/system.js index a74bc709425..7e3b4573062 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