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

CLOUDSTACK-4687: UI > infrastructure > zone > UCS > blades > add extra properties (Chassis, Blade ID) to ucsblade object returned by API which has only bladedn property.

This commit is contained in:
Jessica Wang 2013-09-16 14:52:01 -07:00
parent 12e295d757
commit 59c6fb7ff2
2 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ui/scripts/sharedFunctions.js
View File

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

16
ui/scripts/system.js
View File

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