You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by kn...@apache.org on 2009/11/11 01:53:17 UTC

svn commit: r834730 - /wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/markup/html/form/Form.java

Author: knopp
Date: Wed Nov 11 00:53:16 2009
New Revision: 834730

URL: http://svn.apache.org/viewvc?rev=834730&view=rev
Log:

Issue: WICKET-2570

Modified:
    wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/markup/html/form/Form.java

Modified: wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/markup/html/form/Form.java
URL: http://svn.apache.org/viewvc/wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/markup/html/form/Form.java?rev=834730&r1=834729&r2=834730&view=diff
==============================================================================
--- wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/markup/html/form/Form.java (original)
+++ wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/markup/html/form/Form.java Wed Nov 11 00:53:16 2009
@@ -601,12 +601,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;
 						}
 					}