From 59c6fb7ff27ccb8627c0a274bfb9b9b47162cf43 Mon Sep 17 00:00:00 2001 From: Jessica Wang Date: Mon, 16 Sep 2013 14:52:01 -0700 Subject: [PATCH] CLOUDSTACK-4687: UI > infrastructure > zone > UCS > blades > add extra properties (Chassis, Blade ID) to ucsblade object returned by API which has only bladedn property. --- ui/scripts/sharedFunctions.js | 9 ++++++++- ui/scripts/system.js | 16 ++++++++-------- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/ui/scripts/sharedFunctions.js b/ui/scripts/sharedFunctions.js index 88f62ef5bdf..fdeb7d10b09 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) { diff --git a/ui/scripts/system.js b/ui/scripts/system.js index 9a430873282..1ddbc21cb8a 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; } }