Skip to content

Commit

Permalink
Set the role type to SYSTEM for auto generated roles, which is simila…
Browse files Browse the repository at this point in the history
…r to the default behavior
  • Loading branch information
scholtalbers committed Mar 16, 2018
1 parent ebb7be8 commit be02063
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions lib/galaxy/security/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -777,15 +777,15 @@ def get_private_user_role(self, user, auto_create=False):
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,
self.model.Role.table.c.type == type)) \
.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
Expand Down

0 comments on commit be02063

Please sign in to comment.