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

cloudstack 3.0 UI - autoscale -fix a bug that action bar was not refreshed after action was complete.

This commit is contained in:
Jessica Wang 2012-08-08 13:56:13 -07:00
parent 685af150bc
commit 5a9dbcf187
2 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ui/scripts/autoscaler.js
View File

@ -81,11 +81,19 @@
if(args.context.originalAutoscaleData == null) { //new LB rule
//no actions for new LB rule
}
else { //existing LB rule
if(args.context.originalAutoscaleData[0].context.autoscaleVmGroup.state == 'disabled')
allowedActions.push('enable');
else if(args.context.originalAutoscaleData[0].context.autoscaleVmGroup.state == 'enabled')
allowedActions.push('disable');
else { //existing LB rule
if(args.context.originalAutoscaleData[0].afterActionIsComplete == null) {
if(args.context.originalAutoscaleData[0].context.autoscaleVmGroup.state == 'disabled')
allowedActions.push('enable');
else if(args.context.originalAutoscaleData[0].context.autoscaleVmGroup.state == 'enabled')
allowedActions.push('disable');
}
else {
if(args.context.originalAutoscaleData[0].afterActionIsComplete.state == 'disabled')
allowedActions.push('enable');
else if(args.context.originalAutoscaleData[0].afterActionIsComplete.state == 'enabled')
allowedActions.push('disable');
}
}
return allowedActions;
},

6
ui/scripts/ui-custom/autoscaler.js
View File

@ -95,8 +95,12 @@
});
// Reload actions
if(data != null) { //data is originalAutoscaleData in \ui\scripts\autoscaler.js
data['afterActionIsComplete'] = args.data;
}
var $newActions = renderActions({
data: data ? $.extend(data, args.data) : args.data,
data: data ? data: args.data,
actionFilter: args.actionFilter,
context: context
});