On 01/01/16 22:16, Martin Grigorov wrote:
On Sun, Dec 27, 2015 at 5:47 PM, <[email protected]> wrote:
Repository: wicket
Updated Branches:
refs/heads/master a169eb112 -> 4f9f7ad4b
WICKET-6059 TransparentWebMarkupContainer can not resolve autocomponents
in its parent
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/4f9f7ad4
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/4f9f7ad4
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/4f9f7ad4
Branch: refs/heads/master
Commit: 4f9f7ad4be700268a356d4c8add24daba1a0209d
Parents: a169eb1
Author: Andrea Del Bene <[email protected]>
Authored: Sun Dec 27 17:45:54 2015 +0100
Committer: Andrea Del Bene <[email protected]>
Committed: Sun Dec 27 17:46:43 2015 +0100
----------------------------------------------------------------------
.../html/TransparentWebMarkupContainer.java | 3 +--
.../html/border/BorderWithAutoLabelPage.html | 14 +++++++++++++
.../html/border/BorderWithAutoLabelPage.java | 22 ++++++++++++++++++++
.../markup/html/border/ComponentBorderTest.java | 6 ++++++
4 files changed, 43 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/4f9f7ad4/wicket-core/src/main/java/org/apache/wicket/markup/html/TransparentWebMarkupContainer.java
----------------------------------------------------------------------
diff --git
a/wicket-core/src/main/java/org/apache/wicket/markup/html/TransparentWebMarkupContainer.java
b/wicket-core/src/main/java/org/apache/wicket/markup/html/TransparentWebMarkupContainer.java
index 0bfd294..e697a77 100644
---
a/wicket-core/src/main/java/org/apache/wicket/markup/html/TransparentWebMarkupContainer.java
+++
b/wicket-core/src/main/java/org/apache/wicket/markup/html/TransparentWebMarkupContainer.java
@@ -56,8 +56,7 @@ public class TransparentWebMarkupContainer extends
WebMarkupContainer implements
public Component resolve(MarkupContainer container, MarkupStream
markupStream, ComponentTag tag)
{
Component resolvedComponent = getParent().get(tag.getId());
- if (resolvedComponent != null &&
- (getPage().wasRendered(resolvedComponent) ||
resolvedComponent.isAuto()))
+ if (resolvedComponent != null &&
getPage().wasRendered(resolvedComponent))
{
/*
* Means that parent container has an associated
homonymous tag to this grandchildren
http://git-wip-us.apache.org/repos/asf/wicket/blob/4f9f7ad4/wicket-core/src/test/java/org/apache/wicket/markup/html/border/BorderWithAutoLabelPage.html
----------------------------------------------------------------------
diff --git
a/wicket-core/src/test/java/org/apache/wicket/markup/html/border/BorderWithAutoLabelPage.html
b/wicket-core/src/test/java/org/apache/wicket/markup/html/border/BorderWithAutoLabelPage.html
new file mode 100644
index 0000000..cd5db63
--- /dev/null
+++
b/wicket-core/src/test/java/org/apache/wicket/markup/html/border/BorderWithAutoLabelPage.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="UTF-8">
+<title>Insert title here</title>
+</head>
+<body>
+ <div wicket:id="container">
+ <div wicket:id="border">
+ <label wicket:for="text" class="inline"><input type="text"
wicket:id="text"/></label>
+ </div>
+ </div>
+</body>
+</html>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/wicket/blob/4f9f7ad4/wicket-core/src/test/java/org/apache/wicket/markup/html/border/BorderWithAutoLabelPage.java
----------------------------------------------------------------------
diff --git
a/wicket-core/src/test/java/org/apache/wicket/markup/html/border/BorderWithAutoLabelPage.java
b/wicket-core/src/test/java/org/apache/wicket/markup/html/border/BorderWithAutoLabelPage.java
new file mode 100644
index 0000000..9576fbf
--- /dev/null
+++
b/wicket-core/src/test/java/org/apache/wicket/markup/html/border/BorderWithAutoLabelPage.java
@@ -0,0 +1,22 @@
+package org.apache.wicket.markup.html.border;
+
+import org.apache.wicket.markup.html.WebMarkupContainer;
+import org.apache.wicket.markup.html.WebPage;
+import org.apache.wicket.markup.html.form.TextField;
+
+public class BorderWithAutoLabelPage extends WebPage
+{
+ @Override
+ protected void onInitialize()
+ {
+ super.onInitialize();
+ BorderComponent1 component1 = new
BorderComponent1("border");
+ WebMarkupContainer container = new
WebMarkupContainer("container");
+
+ component1.add(new TextField<>("text"));
+ container.add(component1);
+
+ add(container);
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/wicket/blob/4f9f7ad4/wicket-core/src/test/java/org/apache/wicket/markup/html/border/ComponentBorderTest.java
----------------------------------------------------------------------
diff --git
a/wicket-core/src/test/java/org/apache/wicket/markup/html/border/ComponentBorderTest.java
b/wicket-core/src/test/java/org/apache/wicket/markup/html/border/ComponentBorderTest.java
index fb70117..8fed060 100644
---
a/wicket-core/src/test/java/org/apache/wicket/markup/html/border/ComponentBorderTest.java
+++
b/wicket-core/src/test/java/org/apache/wicket/markup/html/border/ComponentBorderTest.java
@@ -118,4 +118,10 @@ public class ComponentBorderTest extends
WicketTestCase
{
tester.startPage(BorderWithEnclosurePage.class);
}
+
+ @Test
+ public void borderWithAutoLabel() throws Exception
+ {
+ tester.startPage(BorderWithAutoLabelPage.class);
It would be good if there is some assertion here, e.g.
tester.assertRenderedPage()
Done! Thank you!
+ }
}
