Repository: wicket
Updated Branches:
  refs/heads/wicket-7.x 1c26a5dc7 -> 4457e505d


WICKET-6264: Form: improve error message for disabled/invisible 
IFormSubmittingComponent


Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/afe1e333
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/afe1e333
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/afe1e333

Branch: refs/heads/wicket-7.x
Commit: afe1e333c662d6e15842b8112eedd20ae2223646
Parents: a24e12c
Author: barney2k7 <[email protected]>
Authored: Mon Oct 31 09:15:43 2016 +0100
Committer: barney2k7 <[email protected]>
Committed: Mon Oct 31 09:15:43 2016 +0100

----------------------------------------------------------------------
 .../java/org/apache/wicket/markup/html/form/Form.java     | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/wicket/blob/afe1e333/wicket-core/src/main/java/org/apache/wicket/markup/html/form/Form.java
----------------------------------------------------------------------
diff --git 
a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/Form.java 
b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/Form.java
index f3fdbb8..af2e11f 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/Form.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/Form.java
@@ -762,16 +762,22 @@ public class Form<T> extends WebMarkupContainer
 
                                                if 
(!component.isVisibleInHierarchy())
                                                {
+                                                       Page page = findPage();
                                                        throw new 
WicketRuntimeException("Submit Button " +
                                                                
submittingComponent.getInputName() + " (path=" +
-                                                               
component.getPageRelativePath() + ") is not visible");
+                                                               
component.getPath() + ", pageClass=" + 
+                                                               (page == null ? 
"<unknown>" : page.getPageClass().getName()) + 
+                                                               ") is not 
visible");
                                                }
 
                                                if 
(!component.isEnabledInHierarchy())
                                                {
+                                                       Page page = findPage();
                                                        throw new 
WicketRuntimeException("Submit Button " +
                                                                
submittingComponent.getInputName() + " (path=" +
-                                                               
component.getPageRelativePath() + ") is not enabled");
+                                                               
component.getPath() + ", pageClass=" + 
+                                                               (page == null ? 
"<unknown>" : page.getPageClass().getName()) + 
+                                                               ") is not 
enabled");
                                                }
                                        }
                                }

Reply via email to