ryg/royalnet
ryg/royalnet
1
Fork 0
mirror of https://github.com/RYGhub/royalnet.git synced 2024-11-23 19:44:20 +00:00
Code Activity

Allow different page formats 2

Browse source
This commit is contained in:
Steffo 2019-06-10 21:31:14 +02:00
parent 9782cc973b
commit 0c7e13a402
1 changed files with 4 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
royalnet/web/blueprints/wikiview/__init__.py
View file

@ -33,15 +33,11 @@ def prepare_page_markdown(page):
return f.Markup(converted_md) return f.Markup(converted_md)
def prepare_page_html(page):
return f.Markup(page.content)
def prepare_page(page): def prepare_page(page):
if page.format == "markdown": if page.format == "markdown":
return prepare_page_markdown(page) return f.render_template("wikiview_page.html", page=page, parsed_content=f.Markup(prepare_page_markdown(page)))
elif page.format == "html": elif page.format == "html":
return prepare_page_html(page) return f.render_template("wikiview_page.html", page=page, parsed_content=f.Markup(page.content))
else: else:
return "Format not available", 500 return "Format not available", 500
@ -60,8 +56,7 @@ def wikiview_by_id(page_id: str):
page = alchemy_session.query(alchemy.WikiPage).filter(alchemy.WikiPage.page_id == page_uuid).one_or_none() page = alchemy_session.query(alchemy.WikiPage).filter(alchemy.WikiPage.page_id == page_uuid).one_or_none()
if page is None: if page is None:
return "No such page", 404 return "No such page", 404
parsed_content = prepare_page_markdown(page) return prepare_page(page)
return f.render_template("wikiview_page.html", page=page, parsed_content=f.Markup(parsed_content))
@bp.route("/title/<title>") @bp.route("/title/<title>")
@ -70,5 +65,4 @@ def wikiview_by_title(title: str):
page = alchemy_session.query(alchemy.WikiPage).filter(alchemy.WikiPage.title == title).one_or_none() page = alchemy_session.query(alchemy.WikiPage).filter(alchemy.WikiPage.title == title).one_or_none()
if page is None: if page is None:
return "No such page", 404 return "No such page", 404
parsed_content = prepare_page_markdown(page) return prepare_page(page)
return f.render_template("wikiview_page.html", page=page, parsed_content=parsed_content)