Updated Branches:
refs/heads/autoscale 964438253 -> 15499dabb
Autoscale UI actions: Support passing new actionFilter on complete
Conflicts:
ui/scripts/ui-custom/autoscaler.js
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit:
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/15499dab
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/15499dab
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/15499dab
Branch: refs/heads/autoscale
Commit: 15499dabb4a06bd91c11d1b591490e53007afe90
Parents: 9644382
Author: Brian Federle <[email protected]>
Authored: Wed Aug 8 10:23:20 2012 -0700
Committer: Brian Federle <[email protected]>
Committed: Wed Aug 8 14:47:05 2012 -0700
----------------------------------------------------------------------
ui/scripts/ui-custom/autoscaler.js | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/15499dab/ui/scripts/ui-custom/autoscaler.js
----------------------------------------------------------------------
diff --git a/ui/scripts/ui-custom/autoscaler.js
b/ui/scripts/ui-custom/autoscaler.js
index df7d56e..a5aad70 100644
--- a/ui/scripts/ui-custom/autoscaler.js
+++ b/ui/scripts/ui-custom/autoscaler.js
@@ -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) {
