diff --git a/lib/galaxy/exceptions/__init__.py b/lib/galaxy/exceptions/__init__.py index f88d05b07ab..88fefb7f88f 100644 --- a/lib/galaxy/exceptions/__init__.py +++ b/lib/galaxy/exceptions/__init__.py @@ -104,16 +104,16 @@ class ObjectNotFound( MessageException ): class Conflict( MessageException ): status_code = 409 - err_code = error_codes.CONFLICT + err_code = error_codes.CONFLICT class InconsistentDatabase ( MessageException ): status_code = 500 - err_code = error_codes.INCONSISTENT_DATABASE + err_code = error_codes.INCONSISTENT_DATABASE class InternalServerError ( MessageException ): status_code = 500 - err_code = error_codes.INTERNAL_SERVER_ERROR + err_code = error_codes.INTERNAL_SERVER_ERROR class NotImplemented ( MessageException ): status_code = 501 - err_code = error_codes.NOT_IMPLEMENTED + err_code = error_codes.NOT_IMPLEMENTED diff --git a/lib/galaxy/webapps/galaxy/buildapp.py b/lib/galaxy/webapps/galaxy/buildapp.py index 0727b690ad9..6951ae78639 100644 --- a/lib/galaxy/webapps/galaxy/buildapp.py +++ b/lib/galaxy/webapps/galaxy/buildapp.py @@ -192,7 +192,6 @@ def app_factory( global_conf, **kwargs ): webapp.mapper.connect( 'workflow_usage', '/api/workflows/{workflow_id}/usage', controller='workflows', action='workflow_usage', conditions=dict(method=['GET'])) webapp.mapper.connect( 'workflow_usage_contents', '/api/workflows/{workflow_id}/usage/{usage_id}', controller='workflows', action='workflow_usage_contents', conditions=dict(method=['GET'])) - # ============================ # ===== AUTHENTICATE API ===== # ============================ @@ -248,8 +247,8 @@ def app_factory( global_conf, **kwargs ): parent_resources=dict( member_name='library', collection_name='libraries' ) ) _add_item_extended_metadata_controller( webapp, - name_prefix="library_dataset_", - path_prefix='/api/libraries/:library_id/contents/:library_content_id' ) + name_prefix="library_dataset_", + path_prefix='/api/libraries/:library_id/contents/:library_content_id' ) # ======================= # ===== FOLDERS API =====