Mercurial > piecrust2

comparison piecrust/data/builder.py @ 298:b7ab1b503510

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
data: Fix incorrect next/previous page URLs in pagination data. Consolidate splitting an URL between its first URL and its sub page number. Be careful about the index page's URL not losing its slash.
author Ludovic Chabant <ludovic@chabant.com>
date Wed, 11 Mar 2015 23:46:42 -0700
parents d9d5c5de02a8
children 412537e91e45
comparison
equal deleted inserted replaced
297:2823ea40cfac 298:b7ab1b503510
5 from piecrust.configuration import merge_dicts 5 from piecrust.configuration import merge_dicts
6 from piecrust.data.assetor import Assetor 6 from piecrust.data.assetor import Assetor
7 from piecrust.data.debug import build_debug_info 7 from piecrust.data.debug import build_debug_info
8 from piecrust.data.linker import PageLinkerData 8 from piecrust.data.linker import PageLinkerData
9 from piecrust.data.paginator import Paginator 9 from piecrust.data.paginator import Paginator
10 from piecrust.uriutil import get_slug, get_first_sub_uri 10 from piecrust.uriutil import get_slug, split_sub_uri
11 11
12 12
13 logger = logging.getLogger(__name__) 13 logger = logging.getLogger(__name__)
14 14
15 15
27 27
28 28
29 def build_page_data(ctx): 29 def build_page_data(ctx):
30 page = ctx.page 30 page = ctx.page
31 app = page.app 31 app = page.app
32 first_uri = get_first_sub_uri(app, ctx.uri) 32 first_uri, _ = split_sub_uri(app, ctx.uri)
33 33
34 pc_data = PieCrustData() 34 pc_data = PieCrustData()
35 pgn_source = ctx.pagination_source or get_default_pagination_source(page) 35 pgn_source = ctx.pagination_source or get_default_pagination_source(page)
36 paginator = Paginator(page, pgn_source, first_uri, ctx.page_num, 36 paginator = Paginator(page, pgn_source, first_uri, ctx.page_num,
37 ctx.pagination_filter) 37 ctx.pagination_filter)