etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CLOUDSTACK-6852: UI - modules - add DR fields to volume detailView, network detailView, zone detailView.

This commit is contained in:
Jessica Wang 2014-06-09 11:38:34 -07:00
parent 89a03c7099
commit 1641b28054
3 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ui/scripts/network.js
View File

@ -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

4
ui/scripts/storage.js
View File

@ -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

7
ui/scripts/system.js
View File

@ -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