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

bug 14352: Fix LB instance naming 

status 14352: resolved fixed
This commit is contained in:
bfederle 2012-03-20 16:28:45 -07:00
parent 10f8b222ae
commit 2a653782db
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ui/scripts/network.js
View File

@ -2032,7 +2032,7 @@
},
success: function(json) {
var stickyPolicy = json.listlbstickinesspoliciesresponse.stickinesspolicies ?
json.listlbstickinesspoliciesresponse.stickinesspolicies[0].stickinesspolicy : null
json.listlbstickinesspoliciesresponse.stickinesspolicies[0].stickinesspolicy : null;
if (stickyPolicy && stickyPolicy.length) {
stickyPolicy = stickyPolicy[0];
@ -2068,7 +2068,8 @@
id: item.id
},
success: function(data) {
lbInstances = data.listloadbalancerruleinstancesresponse.loadbalancerruleinstance;
lbInstances = data.listloadbalancerruleinstancesresponse.loadbalancerruleinstance ?
data.listloadbalancerruleinstancesresponse.loadbalancerruleinstance : [];
},
error: function(data) {
args.response.error(parseXMLHttpResponse(data));
@ -2076,7 +2077,11 @@
});
$.extend(item, {
_itemData: lbInstances,
_itemData: $.map(lbInstances, function(instance) {
return $.extend(instance, {
name: instance.instancename
});
}),
_maxLength: {
name: 7
},