mirror of
https://github.com/galaxyproject/galaxy.git
synced 2026-09-24 16:30:27 +08:00
Merge branch 'release_20.01' into dev
This commit is contained in:
@@ -34,6 +34,9 @@ class RBACAgent(object):
|
||||
"""
|
||||
return [x for x in [self.permitted_actions.get(action_string) for action_string in permitted_action_strings] if x is not None]
|
||||
|
||||
def create_user_role(self, user, app):
|
||||
raise Exception("Unimplemented Method")
|
||||
|
||||
def create_private_user_role(self, user):
|
||||
raise Exception("Unimplemented Method")
|
||||
|
||||
@@ -128,6 +131,9 @@ class CommunityRBACAgent(RBACAgent):
|
||||
self.associate_components(role=role, user=user)
|
||||
return role
|
||||
|
||||
def create_user_role(self, user, app):
|
||||
self.get_private_user_role(user, auto_create=True)
|
||||
|
||||
def get_item_actions(self, action, item):
|
||||
# item must be one of: Dataset, Library, LibraryFolder, LibraryDataset, LibraryDatasetDatasetAssociation
|
||||
return [permission for permission in item.actions if permission.action == action.action]
|
||||
|
||||
Reference in New Issue
Block a user