Repository: cloudstack Updated Branches: refs/heads/4.4-forward 508a966aa -> 497042508
UI - modules - replace addExtraPropertiesIfDrModuleIncluded() with cloudStack.dr.sharedFunctions.addExtraProperties(). Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/49704250 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/49704250 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/49704250 Branch: refs/heads/4.4-forward Commit: 497042508ab682eb4a45f0e71b301f588545ee17 Parents: 508a966 Author: Jessica Wang <[email protected]> Authored: Fri Jun 13 16:35:29 2014 -0700 Committer: Jessica Wang <[email protected]> Committed: Fri Jun 13 16:43:13 2014 -0700 ---------------------------------------------------------------------- ui/scripts/instances.js | 7 ++++--- ui/scripts/network.js | 9 +++++---- ui/scripts/sharedFunctions.js | 26 -------------------------- ui/scripts/storage.js | 5 +++-- ui/scripts/system.js | 14 ++++++++------ 5 files changed, 20 insertions(+), 41 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/49704250/ui/scripts/instances.js ---------------------------------------------------------------------- diff --git a/ui/scripts/instances.js b/ui/scripts/instances.js index cda531e..93a40fc 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, http://git-wip-us.apache.org/repos/asf/cloudstack/blob/49704250/ui/scripts/network.js ---------------------------------------------------------------------- diff --git a/ui/scripts/network.js b/ui/scripts/network.js index 4772c34..2039aa0 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 http://git-wip-us.apache.org/repos/asf/cloudstack/blob/49704250/ui/scripts/sharedFunctions.js ---------------------------------------------------------------------- diff --git a/ui/scripts/sharedFunctions.js b/ui/scripts/sharedFunctions.js index d79c6f5..f58fdd2 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; http://git-wip-us.apache.org/repos/asf/cloudstack/blob/49704250/ui/scripts/storage.js ---------------------------------------------------------------------- diff --git a/ui/scripts/storage.js b/ui/scripts/storage.js index 197ad71..260f521 100644 --- a/ui/scripts/storage.js +++ b/ui/scripts/storage.js @@ -1499,8 +1499,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, http://git-wip-us.apache.org/repos/asf/cloudstack/blob/49704250/ui/scripts/system.js ---------------------------------------------------------------------- diff --git a/ui/scripts/system.js b/ui/scripts/system.js index 156be7a..37fe504 100644 --- a/ui/scripts/system.js +++ b/ui/scripts/system.js @@ -1954,9 +1954,10 @@ success: function (json) { 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, @@ -7594,9 +7595,10 @@ } //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,
