Mercurial > piecrust2
changeset 922:b447c24bc8d4
Merge changes from PieCrust2 branch.
| author | Ludovic Chabant <ludovic@chabant.com> |
|---|---|
| date | Fri, 29 Sep 2017 17:05:09 -0700 |
| parents | 628d639bb30b (current diff) d91e013b586a (diff) |
| children | 5713b6a2850d |
| files | piecrust/data/paginationdata.py piecrust/serving/server.py |
| diffstat | 3 files changed, 7 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/piecrust/data/debug.py Fri Sep 29 08:45:48 2017 -0700 +++ b/piecrust/data/debug.py Fri Sep 29 17:05:09 2017 -0700 @@ -219,7 +219,7 @@ lambda d: sorted(iter(d.items()), key=lambda i: i[0])) if (rendered_count == 0 and not hasattr(data.__class__, 'debug_render_not_empty')): - self._writeLine('<p class="%s %s">(empty dictionary)</p>' % + self._writeLine('<p class="%s">(empty dictionary)</p>' % CSS_DOC) self._writeLine('</div>')
--- 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,
--- a/piecrust/serving/server.py Fri Sep 29 08:45:48 2017 -0700 +++ b/piecrust/serving/server.py Fri Sep 29 17:05:09 2017 -0700 @@ -129,7 +129,7 @@ if request.path.startswith('/_cache/'): # Some stuff needs to be served directly from the cache directory, # like LESS CSS map files. - full_path = os.path.join(self.root_dir, rel_req_path) + full_path = os.path.join(self.appfactory.root_dir, rel_req_path) else: full_path = os.path.join(self._out_dir, rel_req_path)