This is an automated email from the ASF dual-hosted git repository. adelbene pushed a commit to branch WICKET-6662 in repository https://gitbox.apache.org/repos/asf/wicket.git
commit 77d05ce723ccd2436cdb8fe19e03c7b86473a8e5 Author: Sven Meier <[email protected]> AuthorDate: Wed Apr 24 09:13:21 2019 +0200 WICKET-6658 allow non-form tag for nested forms --- .../src/main/java/org/apache/wicket/markup/html/form/Form.java | 10 +++++++--- .../org/apache/wicket/markup/html/form/NestedFormsPage.html | 5 +++-- 2 files changed, 10 insertions(+), 5 deletions(-) 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 ce5bb5c..ca15dea 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 @@ -1568,10 +1568,10 @@ public class Form<T> extends WebMarkupContainer { super.onComponentTag(tag); - checkComponentTag(tag, "form"); - if (isRootForm()) { + checkComponentTag(tag, "form"); + String method = getMethod().toLowerCase(Locale.ROOT); tag.put("method", method); String url = getActionUrl().toString(); @@ -1624,7 +1624,11 @@ public class Form<T> extends WebMarkupContainer } else { - tag.setName("div"); + // WICKET-6658 form is not allowed, anything else can stay as is + if ("form".equals(tag.getName())) + { + tag.setName("div"); + } tag.remove("method"); tag.remove("action"); tag.remove("enctype"); diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/NestedFormsPage.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/NestedFormsPage.html index 826f9be..5b3ace3 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/NestedFormsPage.html +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/NestedFormsPage.html @@ -42,13 +42,14 @@ <a wicket:id="toggle">[toggle]</a><br/> <input type="button" wicket:id="submit"/> - <form wicket:id="innerForm"> + <!-- WICKET-6658 for nested forms any tag is allowed --> + <span wicket:id="innerForm"> <input type="text" wicket:id="first"/> <input type="text" wicket:id="second"/><br/> <a wicket:id="ajaxSubmit">submit via ajax</a><br/> <a wicket:id="toggle">[toggle]</a><br/> <input type="button" wicket:id="submit"/> - </form> + </span> </form> </form> </body>
