Mercurial > piecrust2
comparison piecrust/data/base.py @ 256:da5e6e00fb41
bake/serve: Make previewed and baked URLs consistent.
The preview server now handles the `pretty_urls` setting correctly instead of
forcing it.
The `trailing_slash` and `pagination_suffix` setting are also doing the same
between the 2 systems.
| author | Ludovic Chabant <ludovic@chabant.com> |
|---|---|
| date | Sun, 22 Feb 2015 22:01:58 -0800 |
| parents | f130365568ff |
| children | 422052d2e978 |
comparison
equal
deleted
inserted
replaced
| 250:311447fe3dd0 | 256:da5e6e00fb41 |
|---|---|
| 123 def _get_uri(self): | 123 def _get_uri(self): |
| 124 page = self._page | 124 page = self._page |
| 125 route = page.app.getRoute(page.source.name, page.source_metadata) | 125 route = page.app.getRoute(page.source.name, page.source_metadata) |
| 126 if route is None: | 126 if route is None: |
| 127 raise Exception("Can't get route for page: %s" % page.path) | 127 raise Exception("Can't get route for page: %s" % page.path) |
| 128 return route.getUri(page.source_metadata, page) | 128 return route.getUri(page.source_metadata, provider=page) |
| 129 | 129 |
| 130 def _loadCustom(self): | 130 def _loadCustom(self): |
| 131 page_url = self._get_uri() | 131 page_url = self._get_uri() |
| 132 self._setValue('url', page_url) | 132 self._setValue('url', page_url) |
| 133 self._setValue('slug', get_slug(self._page.app, page_url)) | 133 self._setValue('slug', get_slug(self._page.app, page_url)) |