Merge pull request #5709 from scholtalbers/fix/default_ldap_role_type

[18.01] Fix/default role type on auto created roles
galaxyproject · Mar 16, 2018 · c58ca74 · c58ca74
2 parents ebb7be8 + be02063
commit c58ca74
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/lib/galaxy/security/__init__.py b/lib/galaxy/security/__init__.py
@@ -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