You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by wi...@apache.org on 2013/09/17 16:02:10 UTC
[49/50] [abbrv] git commit: updated refs/heads/disk-cache to c3569db
CLOUDSTACK-4687: UI > infrastructure > zone > UCS > blades > add extra properties (Chassis, Blade ID) to ucsblade object returned by API which has only bladedn property.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/59c6fb7f
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/59c6fb7f
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/59c6fb7f
Branch: refs/heads/disk-cache
Commit: 59c6fb7ff27ccb8627c0a274bfb9b9b47162cf43
Parents: 12e295d
Author: Jessica Wang <je...@apache.org>
Authored: Mon Sep 16 14:52:01 2013 -0700
Committer: Jessica Wang <je...@apache.org>
Committed: Mon Sep 16 14:59:54 2013 -0700
----------------------------------------------------------------------
ui/scripts/sharedFunctions.js | 9 ++++++++-
ui/scripts/system.js | 16 ++++++++--------
2 files changed, 16 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/59c6fb7f/ui/scripts/sharedFunctions.js
----------------------------------------------------------------------
diff --git a/ui/scripts/sharedFunctions.js b/ui/scripts/sharedFunctions.js
index 88f62ef..fdeb7d1 100644
--- a/ui/scripts/sharedFunctions.js
+++ b/ui/scripts/sharedFunctions.js
@@ -1117,7 +1117,7 @@ function listViewDataProvider(args, data) {
});
}
-//used by infrastruct page and network page
+//used by infrastructure page and network page
var addExtraPropertiesToGuestNetworkObject = function(jsonObj) {
jsonObj.networkdomaintext = jsonObj.networkdomain;
jsonObj.networkofferingidText = jsonObj.networkofferingid;
@@ -1139,6 +1139,13 @@ var addExtraPropertiesToGuestNetworkObject = function(jsonObj) {
}
}
+//used by infrastructure page
+var addExtraPropertiesToUcsBladeObject = function(jsonObj) {
+ var array1 = jsonObj.bladedn.split('/');
+ jsonObj.chassis = array1[1];
+ jsonObj.bladeid = array1[2];
+}
+
//find service object in network object
function ipFindNetworkServiceByName(pName, networkObj) {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/59c6fb7f/ui/scripts/system.js
----------------------------------------------------------------------
diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index 9a43087..1ddbc21 100644
--- a/ui/scripts/system.js
+++ b/ui/scripts/system.js
@@ -13833,15 +13833,13 @@
*/
//for testing only (end)
- var data = json.listucsbladeresponse.ucsblade ? json.listucsbladeresponse.ucsblade : [];
- for (var i = 0; i < data.length; i++) {
- var array1 = data[i].bladedn.split('/');
- data[i].chassis = array1[1];
- data[i].bladeid = array1[2];
+ var items = json.listucsbladeresponse.ucsblade ? json.listucsbladeresponse.ucsblade : [];
+ for (var i = 0; i < items.length; i++) {
+ addExtraPropertiesToUcsBladeObject(items[i]);
}
args.response.success({
actionFilter: bladeActionfilter,
- data: data
+ data: items
});
}
});
@@ -13981,7 +13979,8 @@
};
*/
//for testing only (end)
-
+
+ addExtraPropertiesToUcsBladeObject(json.queryasyncjobresultresponse.jobresult.ucsblade);
return json.queryasyncjobresultresponse.jobresult.ucsblade;
}
}
@@ -14052,7 +14051,8 @@
};
*/
//for testing only (end)
-
+
+ addExtraPropertiesToUcsBladeObject(json.queryasyncjobresultresponse.jobresult.ucsblade);
return json.queryasyncjobresultresponse.jobresult.ucsblade;
}
}