opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-10-29 17:42:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6771 from mvdbeek/fix_private_role_none

Browse Source 
[18.05] Use UserRoleAssociation to get private roles
This commit is contained in:
John Chilton
2018-09-26 08:40:59 -04:00
committed by GitHub
parent 02c177152b 2d9b803025
commit 5a97e4fcea
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/galaxy/security/__init__.py
+2 -1
View File
@@ -766,7 +766,8 @@ class GalaxyRBACAgent(RBACAgent):
def get_private_user_role(self, user, auto_create=False):
role = self.sa_session.query(self.model.Role) \
.filter(and_(self.model.Role.table.c.name == user.email,
.filter(and_(self.model.UserRoleAssociation.table.c.user_id == user.id,
self.model.Role.table.c.id == self.model.UserRoleAssociation.table.c.role_id,
self.model.Role.table.c.type == self.model.Role.types.PRIVATE)) \
.first()
if not role: