Author: ivaynberg
Date: Thu Nov 12 05:51:39 2009
New Revision: 835242

URL: http://svn.apache.org/viewvc?rev=835242&view=rev
Log:
fix bug where a disabled form submitting component can be triggered

Modified:
    
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/Form.java

Modified: 
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/Form.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/Form.java?rev=835242&r1=835241&r2=835242&view=diff
==============================================================================
--- 
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/Form.java 
(original)
+++ 
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/Form.java 
Thu Nov 12 05:51:39 2009
@@ -594,12 +594,18 @@
                                                if 
((getRequest().getParameter(name) != null) ||
                                                        
(getRequest().getParameter(name + ".x") != null))
                                                {
-                                                       if 
(!component.isVisible())
+                                                       if 
(!component.isVisibleInHierarchy())
                                                        {
                                                                throw new 
WicketRuntimeException("Submit Button " +
                                                                        
submittingComponent.getInputName() + " (path=" +
                                                                        
component.getPageRelativePath() + ") is not visible");
                                                        }
+                                                       if 
(!component.isEnabledInHierarchy())
+                                                       {
+                                                               throw new 
WicketRuntimeException("Submit Button " +
+                                                                       
submittingComponent.getInputName() + " (path=" +
+                                                                       
component.getPageRelativePath() + ") is not enabled");
+                                                       }
                                                        return 
submittingComponent;
                                                }
                                        }


Reply via email to