Fix for broken urls in blog list

This actually undoes commits 90c62664a6713a9330a4fe44f2cfe58124b29ed3 and 18fe240b931ab8dbd3a8a9fb6760c8b8cdba7ad3 and simply adds the node.url property when rendering a post in the posts_view function. This is what the template macro actually expected in the first place.
This commit is contained in:
Francesco Siddi 2018-01-18 16:02:29 +01:00
parent 2b2910a1ac
commit 4da7a84c86
2 changed files with 6 additions and 5 deletions

View File

@ -35,7 +35,6 @@ def posts_view(project_id=None, project_url=None, url=None, *, archive=False, pa
api = system_util.pillar_api()
# Fetch project (for backgroud images and links generation)
# Fetch project (for background images and links generation)
if project_id:
project = Project.find(project_id, api=api)
@ -78,6 +77,8 @@ def posts_view(project_id=None, project_url=None, url=None, *, archive=False, pa
if post.picture:
post.picture = get_file(post.picture, api=api)
post.url = url_for_node(node=post)
elif posts._items:
post = posts._items[0]
else:

View File

@ -1,7 +1,7 @@
//- ******************************************************* -//
| {% macro render_blog_post(node) %}
| {% if node.picture %}
a.blog_index-header(href="{{ node.properties.url }}")
a.blog_index-header(href="{{ node.url }}")
img(src="{{ node.picture.thumbnail('l', api=api) }}")
| {% endif %}
@ -12,16 +12,16 @@ a.blog_index-header(href="{{ node.properties.url }}")
| {% endif %}
li.when
a(href="{{ node.properties.url }}",
a(href="{{ node.url }}",
title="Updated {{ node._updated | pretty_date }}")
| {{ node._created | pretty_date }}
li
a(href="{{ node.properties.url }}#comments")
a(href="{{ node.url }}#comments")
| comment
a.item-title(
href="{{ node.properties.url }}")
href="{{ node.url }}")
| {{ node.name }}
.item-content