Personal/realms-wiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix scope order when importing partials with metadata.

Browse source 
Render error when importing wiki pages that do not exist.
This commit is contained in:
Chase Sterling 2016-08-09 21:45:07 -04:00
parent 55e2ceccaa
commit 9a730a947e
4 changed files with 18 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

17
realms/modules/wiki/views.py
View file

@ -114,8 +114,7 @@ def edit(name):
content=page.data,
# TODO: Remove this? See #148
info=next(page.history),
sha=page.sha,
partials=_partials(page.imports))
sha=page.sha)
def _partials(imports):
@ -126,14 +125,14 @@ def _partials(imports):
if page_name in partials:
continue
page = g.current_wiki.get_page(page_name)
data = page.data
partials[page_name] = data
if not data:
try:
partials[page_name] = page.data
except KeyError:
partials[page_name] = "`Error importing wiki page '{0}'`".format(page_name)
continue
meta = page._get_meta(data)
if meta and meta.get('import'):
page_queue.extend(meta['import'])
return partials
page_queue.extend(page.imports)
# We want to retain the order (and reverse it) so that combining metadata from the imports works
return list(reversed(partials.items()))
@blueprint.route("/_partials")