Mercurial > piecrust2
diff piecrust/data/builder.py @ 723:606f6d57b5df
routing: Cleanup URL routing and improve page matching.
* Add new types of route parameters for integers (int4, int2, int).
* Remove hard-coded hacks around converting year/month/day values.
* Make the blog post routes use the new typed parameters.
* Fix problems with matching routes with integer parameters when they can
get confused with a sub-page number.
| author | Ludovic Chabant <ludovic@chabant.com> |
|---|---|
| date | Sun, 29 May 2016 20:19:28 -0700 |
| parents | 93b656f0af54 |
| children | 0da1207472d3 |
line wrap: on
line diff
--- a/piecrust/data/builder.py Sun May 29 20:15:56 2016 -0700 +++ b/piecrust/data/builder.py Sun May 29 20:19:28 2016 -0700 @@ -7,7 +7,6 @@ from piecrust.data.paginator import Paginator from piecrust.data.piecrustdata import PieCrustData from piecrust.data.providersdata import DataProvidersData -from piecrust.uriutil import split_sub_uri logger = logging.getLogger(__name__) @@ -32,8 +31,8 @@ def build_page_data(ctx): app = ctx.app page = ctx.page - first_uri, _ = split_sub_uri(app, ctx.uri) pgn_source = ctx.pagination_source or get_default_pagination_source(page) + first_uri = ctx.page.getUri(1) pc_data = PieCrustData() config_data = PageData(page, ctx)