You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by cj...@apache.org on 2010/08/23 16:11:59 UTC

svn commit: r988127 - /myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlButtonRendererBase.java

Author: cjhoward
Date: Mon Aug 23 14:11:58 2010
New Revision: 988127

URL: http://svn.apache.org/viewvc?rev=988127&view=rev
Log:
MYFACES-2890 - Button renderer needs to support f:params properly.

Modified:
    myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlButtonRendererBase.java

Modified: myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlButtonRendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlButtonRendererBase.java?rev=988127&r1=988126&r2=988127&view=diff
==============================================================================
--- myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlButtonRendererBase.java (original)
+++ myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlButtonRendererBase.java Mon Aug 23 14:11:58 2010
@@ -46,6 +46,7 @@ import org.apache.myfaces.shared.renderk
 import org.apache.myfaces.shared.renderkit.html.util.FormInfo;
 import org.apache.myfaces.shared.renderkit.html.util.JavascriptUtils;
 import org.apache.myfaces.shared.renderkit.html.util.ResourceUtils;
+import org.apache.myfaces.shared.util._ComponentUtils;
 
 /**
  * @author Manfred Geiler (latest modification by $Author$)
@@ -94,8 +95,17 @@ public class HtmlButtonRendererBase
     {
         String clientId = uiComponent.getClientId(facesContext);
         Map paramMap = facesContext.getExternalContext().getRequestParameterMap();
+        FormInfo formInfo = _ComponentUtils.findNestingForm(uiComponent, facesContext);
+        String hiddenLink = null;
+         
+        if (formInfo != null)
+        {
+            hiddenLink = (String) facesContext.getExternalContext().getRequestParameterMap().get(
+                HtmlRendererUtils.getHiddenCommandLinkFieldName(formInfo));
+        }
         return paramMap.containsKey(clientId) || paramMap.containsKey(clientId + IMAGE_BUTTON_SUFFIX_X) 
             || paramMap.containsKey(clientId + IMAGE_BUTTON_SUFFIX_Y)
+            || (hiddenLink != null && hiddenLink.equals (clientId))
             || HtmlRendererUtils.isPartialOrBehaviorSubmit(facesContext, clientId);
     }