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

Bug fix: Sharing files failing

Browse Source 
Found using sentry
This commit is contained in:
Tobias Johansson 2018-11-16 12:43:56 +01:00
parent 9182188647
commit 64cc4dc9bf
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pillar/web/projects/routes.py
View File

@ -303,7 +303,7 @@ def view(project_url):
'header_video_node': header_video_node}) 'header_video_node': header_video_node})
def project_navigation_links(project, api) -> list: def project_navigation_links(project: typing.Type[Project], api) -> list:
"""Returns a list of nodes for the project, for top navigation display. """Returns a list of nodes for the project, for top navigation display.
Args: Args:
@ -466,6 +466,7 @@ def view_node(project_url, node_id):
api = system_util.pillar_api() api = system_util.pillar_api()
# First we check if it's a simple string, in which case we are looking for # First we check if it's a simple string, in which case we are looking for
# a static page. Maybe we could use bson.objectid.ObjectId.is_valid(node_id) # a static page. Maybe we could use bson.objectid.ObjectId.is_valid(node_id)
project: typing.Optional[Project] = None
if not utils.is_valid_id(node_id): if not utils.is_valid_id(node_id):
# raise wz_exceptions.NotFound('No such node') # raise wz_exceptions.NotFound('No such node')
project, node = render_node_page(project_url, node_id, api) project, node = render_node_page(project_url, node_id, api)
@ -483,21 +484,21 @@ def view_node(project_url, node_id):
project = Project.find_one({'where': {"url": project_url, '_id': node.project}}, project = Project.find_one({'where': {"url": project_url, '_id': node.project}},
api=api) api=api)
except ResourceNotFound: except ResourceNotFound:
# In theatre mode, we don't need access to the project at all.
if theatre_mode: if theatre_mode:
project = None pass # In theatre mode, we don't need access to the project at all.
else: else:
raise wz_exceptions.NotFound('No such project') raise wz_exceptions.NotFound('No such project')
navigation_links = []
og_picture = node.picture = utils.get_file(node.picture, api=api) og_picture = node.picture = utils.get_file(node.picture, api=api)
if project: if project:
if not node.picture: if not node.picture:
og_picture = utils.get_file(project.picture_header, api=api) og_picture = utils.get_file(project.picture_header, api=api)
project.picture_square = utils.get_file(project.picture_square, api=api) project.picture_square = utils.get_file(project.picture_square, api=api)
navigation_links = project_navigation_links(project, api)
# Append _theatre to load the proper template # Append _theatre to load the proper template
theatre = '_theatre' if theatre_mode else '' theatre = '_theatre' if theatre_mode else ''
navigation_links = project_navigation_links(project, api)
if node.node_type == 'page': if node.node_type == 'page':
return render_template('nodes/custom/page/view_embed.html', return render_template('nodes/custom/page/view_embed.html',