[Hyperic-hq-discuss] hq r13863 - trunk/src/org/hyperic/hq/ui/action/portlet/metricviewer

[<dcr...@hy...>]

Author: dcrutchf
Date: 2009-10-15 17:03:01 -0700 (Thu, 15 Oct 2009)
New Revision: 13863
URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=13863

Modified:
   trunk/src/org/hyperic/hq/ui/action/portlet/metricviewer/ModifyAction.java
Log:
Fix for HHQ-3409

Modified: trunk/src/org/hyperic/hq/ui/action/portlet/metricviewer/ModifyAction.java
===================================================================
--- trunk/src/org/hyperic/hq/ui/action/portlet/metricviewer/ModifyAction.java	2009-10-15 08:46:45 UTC (rev 13862)
+++ trunk/src/org/hyperic/hq/ui/action/portlet/metricviewer/ModifyAction.java	2009-10-16 00:03:01 UTC (rev 13863)
@@ -58,29 +58,9 @@
         PropertiesForm pForm = (PropertiesForm) form;
         HttpSession session = request.getSession();
         WebUser user = RequestUtils.getWebUser(request);
-
         String forwardStr = Constants.SUCCESS_URL;
-        DashboardConfig dashConfig = DashboardUtils.findDashboard(
-        		(Integer)session.getAttribute(Constants.SELECTED_DASHBOARD_ID),
-        		user, boss);
+        DashboardConfig dashConfig = DashboardUtils.findDashboard((Integer)session.getAttribute(Constants.SELECTED_DASHBOARD_ID), user, boss);
         ConfigResponse dashPrefs = dashConfig.getConfig();
-        
-        if(pForm.isRemoveClicked()){
-            DashboardUtils
-                .removeResources(pForm.getIds(),
-                                 PropertiesForm.RESOURCES,
-                                 dashPrefs);
-            ConfigurationProxy.getInstance().setDashboardPreferences(session, user,
-            		boss, dashPrefs);
-            forwardStr = "review";
-        }
-
-        ActionForward forward = checkSubmit(request, mapping, form);
-
-        if (forward != null) {
-            return forward;
-        }
-
         String token = pForm.getToken();
 
         // For multi-portlet configuration
@@ -99,7 +79,20 @@
             descendingKey += token;
             titleKey += token;
         }
+        
+        if(pForm.isRemoveClicked()){
+            DashboardUtils.removeResources(pForm.getIds(), resKey, dashPrefs);
+            ConfigurationProxy.getInstance().setDashboardPreferences(session, user, boss, dashPrefs);
+            
+            forwardStr = "review";
+        }
 
+        ActionForward forward = checkSubmit(request, mapping, form);
+
+        if (forward != null) {
+            return forward;
+        }
+
         Integer numberToShow = pForm.getNumberToShow();
         String resourceType = pForm.getResourceType();
         String metric = pForm.getMetric();