mirror of https://github.com/apache/cloudstack.git
Autoscale UI actions: Support passing new actionFilter on complete
Conflicts: ui/scripts/ui-custom/autoscaler.js
This commit is contained in:
parent
08a73d1134
commit
28513fa6c6
|
|
@ -61,14 +61,15 @@
|
|||
scaleUpPolicyForm, scaleDownPolicyForm;
|
||||
|
||||
var renderActions = function(args) {
|
||||
var targetActionFilter = args.actionFilter ? args.actionFilter : actionFilter;
|
||||
var data = args.data;
|
||||
var context = args.context;
|
||||
var $actions = $('<div>').addClass('detail-group');
|
||||
var $actionsTable = $('<table>').append('<tr>');
|
||||
var $detailActions = $('<td>').addClass('detail-actions');
|
||||
var $buttons = $('<div>').addClass('buttons');
|
||||
var visibleActions = actionFilter ?
|
||||
actionFilter({
|
||||
var visibleActions = targetActionFilter ?
|
||||
targetActionFilter({
|
||||
context: $.extend(true, {}, context, {
|
||||
originalAutoscaleData: data ? [data] : null
|
||||
})
|
||||
|
|
@ -106,7 +107,7 @@
|
|||
}
|
||||
|
||||
var $newActions = renderActions({
|
||||
data: data ? data: args.data,
|
||||
data: data ? $.extend(data, args.data) : args.data,
|
||||
actionFilter: args.actionFilter,
|
||||
context: context
|
||||
});
|
||||
|
|
@ -121,7 +122,7 @@
|
|||
|
||||
action.action({
|
||||
context: {
|
||||
originalAutoscaleData: args.data,
|
||||
originalAutoscaleData: args.data
|
||||
},
|
||||
response: {
|
||||
success: function(args) {
|
||||
|
|
|
|||
Loading…
Reference in New Issue