opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-24 16:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5709 from scholtalbers/fix/default_ldap_role_type

Browse Source 
[18.01] Fix/default role type on auto created roles
This commit is contained in:
Dannon Baker
2018-03-16 11:03:33 -04:00
committed by GitHub
parent ebb7be8d0e be02063c3f
commit c58ca749c2
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/galaxy/security/__init__.py
+2 -2
View File
@@ -777,7 +777,7 @@ class GalaxyRBACAgent(RBACAgent):
return role
def get_role(self, name, type=None):
type = type or self.model.Role.types.ADMIN
type = type or self.model.Role.types.SYSTEM
# will raise exception if not found
return self.sa_session.query(self.model.Role) \
.filter(and_(self.model.Role.table.c.name == name,
@@ -785,7 +785,7 @@ class GalaxyRBACAgent(RBACAgent):
.one()
def create_role(self, name, description, in_users, in_groups, create_group_for_role=False, type=None):
type = type or self.model.Role.types.ADMIN
type = type or self.model.Role.types.SYSTEM
role = self.model.Role(name=name, description=description, type=type)
self.sa_session.add(role)
# Create the UserRoleAssociations