archive/attract
0
0
Fork 0
Code Issues 7 Pull Requests Projects Releases Wiki Activity

Fixed Attract link not showing up in sidebar

Browse Source
This commit is contained in:
Sybren A. Stüvel
2017-06-16 11:55:30 +02:00
parent c69aeb03dc
commit 59505d3233
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
attract/__init__.py
View File

@@ -166,11 +166,12 @@ class AttractExtension(PillarExtension):
return True return True
def sidebar_links(self, project): def sidebar_links(self, project):
from pillar.api.utils import str2id
if not self.is_attract_project(project): if not self.is_attract_project(project):
return '' return ''
if not self.auth.current_user_may(auth.Actions.VIEW): if not self.auth.current_user_may(auth.Actions.VIEW, str2id(project['_id'])):
return '' return ''
return flask.render_template('attract/sidebar.html', return flask.render_template('attract/sidebar.html',

12
attract/auth.py
View File

@@ -61,7 +61,7 @@ class Auth(object):
intersection = require_roles.intersection(user_roles) intersection = require_roles.intersection(user_roles)
return bool(intersection) return bool(intersection)
def current_user_may(self, action: Actions) -> bool: def current_user_may(self, action: Actions, project_id: bson.ObjectId=None) -> bool:
"""Returns True iff the user is authorised to use/view Attract on the current project. """Returns True iff the user is authorised to use/view Attract on the current project.
Requires that determine_user_rights() was called before. Requires that determine_user_rights() was called before.
@@ -70,9 +70,13 @@ class Auth(object):
try: try:
attract_rights = flask.g.attract_rights attract_rights = flask.g.attract_rights
except AttributeError: except AttributeError:
self._log.error('current_user_may() called without previous call ' if not project_id:
'to current_user_rights()') self._log.error('current_user_may() called without previous call '
return False 'to current_user_rights()')
return False
self.determine_user_rights(project_id)
attract_rights = flask.g.attract_rights
return action in attract_rights return action in attract_rights