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

Merge.

Browse Source
This commit is contained in:
Dannon Baker
2014-05-07 11:49:14 -04:00
parent ef09b7c4ba e053743ca7
commit 8a2a495781
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/galaxy/exceptions/__init__.py
+4 -4
View File
@@ -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
lib/galaxy/webapps/galaxy/buildapp.py
+2 -3
View File
@@ -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 =====