You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by je...@apache.org on 2014/06/14 01:44:31 UTC
git commit: updated refs/heads/master to 3a3a390
Repository: cloudstack
Updated Branches:
refs/heads/master 3acebf230 -> 3a3a3902b
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/3a3a3902
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/3a3a3902
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/3a3a3902
Branch: refs/heads/master
Commit: 3a3a3902b79cf4d53af2dd52dc71966a2a7b732a
Parents: 3acebf2
Author: Jessica Wang <je...@apache.org>
Authored: Fri Jun 13 16:35:29 2014 -0700
Committer: Jessica Wang <je...@apache.org>
Committed: Fri Jun 13 16:44:15 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 | 10 ++++++----
5 files changed, 18 insertions(+), 39 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3a3a3902/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/3a3a3902/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/3a3a3902/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/3a3a3902/ui/scripts/storage.js
----------------------------------------------------------------------
diff --git a/ui/scripts/storage.js b/ui/scripts/storage.js
index 27fc8cb..93fe79a 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,
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3a3a3902/ui/scripts/system.js
----------------------------------------------------------------------
diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index 7e3b457..710832c 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,