From 4100b808d4dbcea5a02aa9c1a91b84e2ab2be2f2 Mon Sep 17 00:00:00 2001 From: str4d Date: Sat, 15 Nov 2014 23:54:06 +0000 Subject: [PATCH] Remove BLOG_DIR from blog errors without breaking the blog --- i2p2www/blog/helpers.py | 2 +- i2p2www/blog/views.py | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/i2p2www/blog/helpers.py b/i2p2www/blog/helpers.py index 1f50762f..065d389e 100644 --- a/i2p2www/blog/helpers.py +++ b/i2p2www/blog/helpers.py @@ -104,7 +104,7 @@ def render_blog_post(slug): rendered_content = render_template_string(content) # publish the post with docutils - return publish_parts(source=rendered_content, source_path="Blog", writer_name="html") + return publish_parts(source=rendered_content, source_path=BLOG_DIR, writer_name="html") def get_metadata_from_meta(meta): metaLines = meta.split('\n') diff --git a/i2p2www/blog/views.py b/i2p2www/blog/views.py index 9a1c8b61..30e102e0 100644 --- a/i2p2www/blog/views.py +++ b/i2p2www/blog/views.py @@ -1,7 +1,7 @@ from flask import abort, render_template, request from werkzeug.contrib.atom import AtomFeed -from i2p2www import BLOG_POSTS_PER_FEED, BLOG_POSTS_PER_PAGE, cache +from i2p2www import BLOG_DIR, BLOG_POSTS_PER_FEED, BLOG_POSTS_PER_PAGE, cache from i2p2www.blog.helpers import get_blog_posts, get_blog_feed_items, get_date_from_slug, get_metadata_from_meta, render_blog_post from i2p2www.helpers import Pagination, get_for_page @@ -29,6 +29,8 @@ def blog_post(slug): if parts: meta = get_metadata_from_meta(parts['meta']) meta['date'] = meta['date'] if meta['date'] else get_date_from_slug(slug) + # remove BLOG_DIR from any error messages + parts['fragment'] = parts['fragment'].replace(BLOG_DIR, 'Blog') # now just pass to simple template file and we are done return render_template('blog/post.html', parts=parts, title=parts['title'], body=parts['fragment'], slug=slug, meta=meta) else: