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

Display Blog on the sidebar, if available

Browse Source
This commit is contained in:
Pablo Vazquez
2016-09-05 15:59:22 +02:00
parent 3d9b9e40d4
commit fa050da8e2
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pillar/web/utils/jstree.py
View File

@@ -49,8 +49,9 @@ def jstree_get_children(node_id, project_id=None):
if child.node_type not in ['comment', 'post']: if child.node_type not in ['comment', 'post']:
if child.properties.status == 'published': if child.properties.status == 'published':
children_list.append(jstree_parse_node(child)) children_list.append(jstree_parse_node(child))
elif child.node_type == 'blog': # TODO: Remove this code (blog now accessible from sidebar)
children_list.append(jstree_parse_node(child)) # elif child.node_type == 'blog':
# children_list.append(jstree_parse_node(child))
elif current_user.is_authenticated and child.user == current_user.objectid: elif current_user.is_authenticated and child.user == current_user.objectid:
children_list.append(jstree_parse_node(child)) children_list.append(jstree_parse_node(child))
except ForbiddenAccess: except ForbiddenAccess:

8
src/templates/projects/view.jade
View File

@@ -58,6 +58,14 @@ link(href="{{ url_for('static_pillar', filename='assets/css/project-main.css', v
| {% else %} | {% else %}
i.pi-home i.pi-home
| {% endif %} | {% endif %}
| {% if project.nodes_blog %}
li.tabs-blog(
title="Blog",
data-toggle="tooltip",
data-placement="left")
a(href="{{url_for('main.project_blog', project_url=project.url)}}")
i.pi-newspaper
| {% endif %}
li.tabs-browse( li.tabs-browse(
title="Browse", title="Browse",
data-toggle="tooltip", data-toggle="tooltip",