You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by sv...@apache.org on 2019/04/24 08:16:22 UTC
[wicket] branch master updated (b5bf661 -> 1422ba5)
This is an automated email from the ASF dual-hosted git repository.
svenmeier pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/wicket.git.
from b5bf661 WICKET-6656 allow bean validation to handle required annotations
new fc6e7bf WICKET-6658 allow non-form tag for nested forms
new 1422ba5 WICKET-6658 allow non-form tag for nested forms
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../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(-)
[wicket] 01/02: WICKET-6658 allow non-form tag for nested forms
Posted by sv...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
svenmeier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/wicket.git
commit fc6e7bffdfa25053ae7732d59162ac96e12d01d7
Author: Sven Meier <sv...@apache.org>
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>
[wicket] 02/02: WICKET-6658 allow non-form tag for nested forms
Posted by sv...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
svenmeier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/wicket.git
commit 1422ba5e0e3bff53e5326ae1ff39f34667edaa20
Author: Sven Meier <sv...@apache.org>
AuthorDate: Wed Apr 24 09:41:35 2019 +0200
WICKET-6658 allow non-form tag for nested forms
ignore case when comparing tag name
---
wicket-core/src/main/java/org/apache/wicket/markup/html/form/Form.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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 ca15dea..df0f28d 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
@@ -1625,7 +1625,7 @@ public class Form<T> extends WebMarkupContainer
else
{
// WICKET-6658 form is not allowed, anything else can stay as is
- if ("form".equals(tag.getName()))
+ if ("form".equalsIgnoreCase(tag.getName()))
{
tag.setName("div");
}