I2P_Developers/i2p.www
3
0
Fork 5
Code Issues 27 Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Remove BLOG_DIR from blog errors without breaking the blog

Browse Source
This commit is contained in:
str4d
2014-11-15 23:54:06 +00:00
parent 0c9a7b9dd9
commit 4100b808d4
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
i2p2www/blog/helpers.py
View File

@ -104,7 +104,7 @@ def render_blog_post(slug):
rendered_content = render_template_string(content) rendered_content = render_template_string(content)
# publish the post with docutils # 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): def get_metadata_from_meta(meta):
metaLines = meta.split('\n') metaLines = meta.split('\n')

4
i2p2www/blog/views.py
View File

@ -1,7 +1,7 @@
from flask import abort, render_template, request from flask import abort, render_template, request
from werkzeug.contrib.atom import AtomFeed 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.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 from i2p2www.helpers import Pagination, get_for_page
@ -29,6 +29,8 @@ def blog_post(slug):
if parts: if parts:
meta = get_metadata_from_meta(parts['meta']) meta = get_metadata_from_meta(parts['meta'])
meta['date'] = meta['date'] if meta['date'] else get_date_from_slug(slug) 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 # 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) return render_template('blog/post.html', parts=parts, title=parts['title'], body=parts['fragment'], slug=slug, meta=meta)
else: else: