From 28513fa6c6ff53fc791111e9fba7e064b110a3fc Mon Sep 17 00:00:00 2001
From: Brian Federle <brian.federle@citrix.com>
Date: Wed, 8 Aug 2012 10:23:20 -0700
Subject: [PATCH] Autoscale UI actions: Support passing new actionFilter on
 complete

Conflicts:
	ui/scripts/ui-custom/autoscaler.js
---
 ui/scripts/ui-custom/autoscaler.js | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/ui/scripts/ui-custom/autoscaler.js b/ui/scripts/ui-custom/autoscaler.js
index df7d56ea7ef..a5aad7008ae 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) {