Repository: tapestry-5 Updated Branches: refs/heads/master 1c6b51c46 -> 2bc3fab22
FIXED - TAP5-2462: Parent component should be able to reset a Grid regardless of its internal state - do sortModel.clear() before setting the current page because the formerl internally calls the private operation setupPaginationModel(), otherwise you may get a null pointer Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/2bc3fab2 Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/2bc3fab2 Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/2bc3fab2 Branch: refs/heads/master Commit: 2bc3fab2284b3d5a22d5642a5038b3bfd872b93b Parents: 1c6b51c Author: kaosko <[email protected]> Authored: Thu Mar 5 23:00:18 2015 -0800 Committer: kaosko <[email protected]> Committed: Thu Mar 5 23:00:18 2015 -0800 ---------------------------------------------------------------------- .../main/java/org/apache/tapestry5/corelib/components/Grid.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/2bc3fab2/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 ecbd159..bc4dae2 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 @@ -633,8 +633,8 @@ public class Grid implements GridModel, ClientElement */ public void reset() { - setCurrentPage(1); sortModel.clear(); + setCurrentPage(1); } /**
