From 3a3a3902b79cf4d53af2dd52dc71966a2a7b732a Mon Sep 17 00:00:00 2001 From: Jessica Wang Date: Fri, 13 Jun 2014 16:35:29 -0700 Subject: [PATCH] UI - modules - replace addExtraPropertiesIfDrModuleIncluded() with cloudStack.dr.sharedFunctions.addExtraProperties(). --- ui/scripts/instances.js | 7 ++++--- ui/scripts/network.js | 9 +++++---- ui/scripts/sharedFunctions.js | 26 -------------------------- ui/scripts/storage.js | 5 +++-- ui/scripts/system.js | 10 ++++++---- 5 files changed, 18 insertions(+), 39 deletions(-) diff --git a/ui/scripts/instances.js b/ui/scripts/instances.js index cda531e5c58..93a40fc0970 100644 --- a/ui/scripts/instances.js +++ b/ui/scripts/instances.js @@ -1877,9 +1877,10 @@ else jsonObj.xenserverToolsVersion61plus = false; } - - //if DR module is included - addExtraPropertiesIfDrModuleIncluded(jsonObj, "UserVM"); + + if (isModuleIncluded("dr")) { + cloudStack.dr.sharedFunctions.addExtraProperties(jsonObj, "UserVM"); + } args.response.success({ actionFilter: vmActionfilter, diff --git a/ui/scripts/network.js b/ui/scripts/network.js index 4772c34564b..2039aa047e5 100755 --- a/ui/scripts/network.js +++ b/ui/scripts/network.js @@ -1383,10 +1383,11 @@ success: function(json) { var jsonObj = json.listnetworksresponse.network[0]; addExtraPropertiesToGuestNetworkObject(jsonObj); - - //if DR module is included - addExtraPropertiesIfDrModuleIncluded(jsonObj, "Network"); - + + if (isModuleIncluded("dr")) { + cloudStack.dr.sharedFunctions.addExtraProperties(jsonObj, "Network"); + } + args.response.success({ actionFilter: cloudStack.actionFilter.guestNetwork, data: jsonObj diff --git a/ui/scripts/sharedFunctions.js b/ui/scripts/sharedFunctions.js index d79c6f58c18..f58fdd21768 100644 --- a/ui/scripts/sharedFunctions.js +++ b/ui/scripts/sharedFunctions.js @@ -1173,32 +1173,6 @@ function listViewDataProvider(args, data, options) { return data; } -var addExtraPropertiesIfDrModuleIncluded = function(jsonObj, resourceType) { - if (isModuleIncluded("dr")) { - $.ajax({ - url: createURL("listResourceDetails"), - data: { - resourceid: jsonObj.id, - resourcetype: resourceType - }, - async: false, - success: function(json) { - var drFieldNameArray = []; - var resourcedetails = json.listresourcedetailsresponse.resourcedetail; - if (resourcedetails != undefined) { - for (var i = 0; i < resourcedetails.length; i++) { - if (resourcedetails[i].key.indexOf("DR_") > -1) { - drFieldNameArray.push(resourcedetails[i].key); - jsonObj[resourcedetails[i].key] = resourcedetails[i].value; - } - } - } - jsonObj["drFieldNameArray"] = drFieldNameArray; - } - }); - } -} - //used by infrastructure page and network page var addExtraPropertiesToGuestNetworkObject = function(jsonObj) { jsonObj.networkdomaintext = jsonObj.networkdomain; diff --git a/ui/scripts/storage.js b/ui/scripts/storage.js index 27fc8cb7641..93fe79a9f67 100644 --- a/ui/scripts/storage.js +++ b/ui/scripts/storage.js @@ -1502,8 +1502,9 @@ success: function(json) { var jsonObj = json.listvolumesresponse.volume[0]; - //if DR module is included - addExtraPropertiesIfDrModuleIncluded(jsonObj, "Volume"); + if (isModuleIncluded("dr")) { + cloudStack.dr.sharedFunctions.addExtraProperties(jsonObj, "Volume"); + } args.response.success({ actionFilter: volumeActionfilter, diff --git a/ui/scripts/system.js b/ui/scripts/system.js index 7e3b4573062..710832cdba0 100644 --- a/ui/scripts/system.js +++ b/ui/scripts/system.js @@ -1955,8 +1955,9 @@ selectedGuestNetworkObj = json.listnetworksresponse.network[0]; addExtraPropertiesToGuestNetworkObject(selectedGuestNetworkObj); - //if DR module is included - addExtraPropertiesIfDrModuleIncluded(selectedGuestNetworkObj, "Network"); + if (isModuleIncluded("dr")) { + cloudStack.dr.sharedFunctions.addExtraProperties(selectedGuestNetworkObj, "Network"); + } args.response.success({ actionFilter: cloudStack.actionFilter.guestNetwork, @@ -7595,8 +7596,9 @@ //override default error handling: cloudStack.dialog.notice({ message: parseXMLHttpResponse(XMLHttpResponse)}); }); - //if DR module is included - addExtraPropertiesIfDrModuleIncluded(selectedZoneObj, "Zone"); + if (isModuleIncluded("dr")) { + cloudStack.dr.sharedFunctions.addExtraProperties(selectedZoneObj, "Zone"); + } args.response.success({ actionFilter: zoneActionfilter,