Mercurial > piecrust2
diff piecrust/data/paginationdata.py @ 922:b447c24bc8d4
Merge changes from PieCrust2 branch.
author | Ludovic Chabant <ludovic@chabant.com> |
---|---|
date | Fri, 29 Sep 2017 17:05:09 -0700 |
parents | d6d35b2efd04 cd236a6af9f6 |
children | cc55740860de |
line wrap: on
line diff
--- a/piecrust/data/paginationdata.py Fri Sep 29 08:45:48 2017 -0700 +++ b/piecrust/data/paginationdata.py Fri Sep 29 17:05:09 2017 -0700 @@ -1,3 +1,4 @@ +import copy import time import logging from piecrust.data.pagedata import LazyPageConfigData @@ -19,9 +20,11 @@ set_val = self._setValue page_url = page.getUri() - _, slug = split_uri(page.app, page_url) + _, rel_url = split_uri(page.app, page_url) set_val('url', page_url) - set_val('slug', slug) + set_val('rel_url', rel_url) + set_val('slug', rel_url) # For backwards compatibility + set_val('route', copy.deepcopy(page.source_metadata['route_params'])) set_val('timestamp', time.mktime(page.datetime.timetuple())) set_val('datetime', { 'year': dt.year, 'month': dt.month, 'day': dt.day,