Repository: tapestry-5 Updated Branches: refs/heads/master 3950c51d6 -> 6a933834d
TAP5-2385: reset the zone field in the CleanupRender phase so it is not reset during in-place updates Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/6a933834 Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/6a933834 Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/6a933834 Branch: refs/heads/master Commit: 6a933834d2bc2aae3736661ef771c44fc7766c90 Parents: 3950c51 Author: Jochen Kemnade <jochen.kemn...@eddyson.de> Authored: Fri Sep 12 12:33:49 2014 +0200 Committer: Jochen Kemnade <jochen.kemn...@eddyson.de> Committed: Fri Sep 12 12:33:49 2014 +0200 ---------------------------------------------------------------------- .../java/org/apache/tapestry5/corelib/components/Grid.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/6a933834/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Grid.java ---------------------------------------------------------------------- diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Grid.java b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Grid.java index 6f84ae8..ecbd159 100644 --- a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Grid.java +++ b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Grid.java @@ -455,7 +455,6 @@ public class Grid implements GridModel, ClientElement Object setupRender() { - zone = null; setupPaginationModel(); @@ -471,6 +470,13 @@ public class Grid implements GridModel, ClientElement return !renderTableIfEmpty && cachingSource.getAvailableRows() == 0 ? empty : null; } + void cleanupRender() + { + // if an inPlace Grid is rendered inside a Loop, be sure to generate a new wrapper + // zone for each iteration (TAP5-2256) + zone = null; + } + private void setupPaginationModel() { if (paginationModel == null)