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

refactor decode_id method to use base manager

Browse Source
This commit is contained in:
Martin Cech
2017-08-17 15:18:28 -04:00
parent 042386ff87
commit 61eb011403
2 changed files with 11 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/galaxy/managers/workflows.py
+6
View File
@@ -29,9 +29,15 @@ from galaxy.web import url_for
log = logging.getLogger(__name__)
<<<<<<< HEAD
class WorkflowsManager(object):
""" Handle CRUD type operaitons related to workflows. More interesting
stuff regarding workflow execution, step sorting, etc... can be found in
=======
class WorkflowsManager( object ):
"""Handle CRUD type operations related to workflows. More interesting
stuff regarding workflow execution, step sorting, etc. can be found in
>>>>>>> e4125bef2f... fix typo
the galaxy.workflow module.
"""
lib/galaxy/webapps/galaxy/api/lda_datasets.py
+5 -15
View File
@@ -15,6 +15,7 @@ from galaxy import util
from galaxy import web
from galaxy.exceptions import ObjectNotFound
from galaxy.managers import folders, roles, tags
from galaxy.managers import base as managers_base
from galaxy.tools.actions import upload_common
from galaxy.tools.parameters import populate_state
from galaxy.util.streamball import StreamBall
@@ -29,6 +30,7 @@ class LibraryDatasetsController(BaseAPIController, UsesVisualizationMixin):
def __init__(self, app):
super(LibraryDatasetsController, self).__init__(app)
self.app = app
self.folder_manager = folders.FolderManager()
self.role_manager = roles.RoleManager(app)
@@ -264,7 +266,7 @@ class LibraryDatasetsController(BaseAPIController, UsesVisualizationMixin):
trans.app.security_agent.make_dataset_public(dataset)
else:
for role_id in new_access_roles_ids:
role = self.role_manager.get(trans, self.__decode_id(trans, role_id, 'role'))
role = self.role_manager.get(trans, managers_base.decode_id( self.app, role_id ))
# Check whether role is in the set of allowed roles
valid_roles, total_roles = trans.app.security_agent.get_valid_roles(trans, dataset)
if role in valid_roles:
@@ -287,6 +289,7 @@ class LibraryDatasetsController(BaseAPIController, UsesVisualizationMixin):
for role_id in new_manage_roles_ids:
role = self.role_manager.get(trans, self.__decode_id(trans, role_id, 'role'))
role = self.role_manager.get(trans, managers_base.decode_id(self.app, role_id))
# Check whether role is in the set of access roles
if role in active_access_roles:
valid_manage_roles.append(role)
@@ -309,6 +312,7 @@ class LibraryDatasetsController(BaseAPIController, UsesVisualizationMixin):
for role_id in new_modify_roles_ids:
role = self.role_manager.get(trans, self.__decode_id(trans, role_id, 'role'))
role = self.role_manager.get(trans, managers_base.decode_id(self.app, role_id))
# Check whether role is in the set of access roles
if role in active_access_roles:
valid_modify_roles.append(role)
@@ -744,17 +748,3 @@ class LibraryDatasetsController(BaseAPIController, UsesVisualizationMixin):
upper_folder = trans.sa_session.query(trans.app.model.LibraryFolder).get(folder.parent_id)
path_to_root.extend(self._build_path(trans, upper_folder))
return path_to_root
def __decode_id(self, trans, encoded_id, object_name=None):
"""
Try to decode the id.
:param object_name: Name of the object the id belongs to. (optional)
:type object_name: str
"""
try:
return trans.security.decode_id(encoded_id)
except TypeError:
raise exceptions.MalformedId('Malformed %s id specified, unable to decode.' % object_name if object_name is not None else '')
except ValueError:
raise exceptions.MalformedId('Wrong %s id specified, unable to decode.' % object_name if object_name is not None else '')