archive/pillar
0
0
Fork 0
Code Issues 42 Pull Requests Projects Releases Wiki Activity

Simplified posts_view a bit

Browse Source 
Removed some redundancy, avoided rendering attachments for posts that'll
never be shown, and made the flow a bit clearer.
This commit is contained in:
Sybren A. Stüvel 2017-09-29 10:45:11 +02:00
parent 45a44d08eb
commit 2d01cd8761
1 changed files with 32 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
pillar/web/nodes/custom/posts.py
View File

@ -1,3 +1,5 @@
import logging
from pillarsdk import Node from pillarsdk import Node
from pillarsdk import Project from pillarsdk import Project
from pillarsdk.exceptions import ResourceNotFound from pillarsdk.exceptions import ResourceNotFound
@ -17,6 +19,8 @@ from pillar.web.nodes.forms import get_node_form
import pillar.web.nodes.attachments import pillar.web.nodes.attachments
from pillar.web.projects.routes import project_update_nodes_list from pillar.web.projects.routes import project_update_nodes_list
log = logging.getLogger(__name__)
# Cached, see setup_app() below. # Cached, see setup_app() below.
def posts_view(project_id=None, project_url=None, url=None): def posts_view(project_id=None, project_url=None, url=None):
@ -44,53 +48,57 @@ def posts_view(project_id=None, project_url=None, url=None):
posts = Node.all({ posts = Node.all({
'where': {'parent': blog._id, **status_query}, 'where': {'parent': blog._id, **status_query},
'embedded': {'user': 1}, 'embedded': {'user': 1},
'sort': '-_created' 'sort': '-_created',
}, api=api) }, api=api)
for post in posts._items: for post in posts._items:
post.picture = get_file(post.picture, api=api) post.picture = get_file(post.picture, api=api)
post['properties']['content'] = pillar.web.nodes.attachments.render_attachments(
post, post['properties']['content'])
# Use the *_main_project.html template for the main blog # Use the *_main_project.html template for the main blog
main_project_template = '_main_project' if project_id == current_app.config['MAIN_PROJECT_ID'] else '' main_project_template = '_main_project' if project_id == current_app.config['MAIN_PROJECT_ID'] else ''
template_path = f'nodes/custom/blog/index{main_project_template}.html',
if url: if url:
template_path = f'nodes/custom/post/view{main_project_template}.html',
post = Node.find_one({ post = Node.find_one({
'where': {'parent': blog._id, 'properties.url': url}, 'where': {'parent': blog._id, 'properties.url': url},
'embedded': {'node_type': 1, 'user': 1}, 'embedded': {'node_type': 1, 'user': 1},
}, api=api) }, api=api)
if post.picture: if post.picture:
post.picture = get_file(post.picture, api=api) post.picture = get_file(post.picture, api=api)
elif posts._items:
post = posts._items[0]
else:
post = None
if post is not None:
# If post is not published, check that the user is also the author of # If post is not published, check that the user is also the author of
# the post. If not, return 404. # the post. If not, return 404.
if post.properties.status != "published": if post.properties.status != "published":
if not (current_user.is_authenticated and post.has_method('PUT')): if not (current_user.is_authenticated and post.has_method('PUT')):
abort(403) abort(403)
post['properties']['content'] = pillar.web.nodes.attachments.render_attachments( try:
post, post['properties']['content']) post_contents = post['properties']['content']
return render_template( except KeyError:
'nodes/custom/post/view{0}.html'.format(main_project_template), log.warning('Blog post %s has no content', post._id)
blog=blog, else:
node=post, post['properties']['content'] = pillar.web.nodes.attachments.render_attachments(
posts=posts._items, post, post_contents)
project=project,
title='blog',
api=api)
else:
node_type_post = project.get_node_type('post')
template_path = 'nodes/custom/blog/index.html'
return render_template( return render_template(
'nodes/custom/blog/index{0}.html'.format(main_project_template), template_path,
node_type_post=node_type_post, blog=blog,
posts=posts._items, node=post,
project=project, posts=posts._items,
title='blog', posts_meta=posts._meta,
api=api) more_posts_available=posts._meta['total'] > posts._meta['max_results'],
project=project,
title='blog',
node_type_post=project.get_node_type('post'),
api=api)
@blueprint.route("/posts/<project_id>/create", methods=['GET', 'POST']) @blueprint.route("/posts/<project_id>/create", methods=['GET', 'POST'])