2 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/fff767c478fb/ Changeset: fff767c478fb User: dannon Date: 2014-05-07 17:48:11 Summary: Merge stable. Affected #: 1 file https://bitbucket.org/galaxy/galaxy-central/commits/c5b736d3e4e5/ Changeset: c5b736d3e4e5 User: dannon Date: 2014-05-07 17:49:14 Summary: Merge. Affected #: 2 files diff -r fff767c478fbce151720d49729d5444f4f85cd28 -r c5b736d3e4e5027391a04fd187e2f9d2aa4ebe46 lib/galaxy/exceptions/__init__.py --- a/lib/galaxy/exceptions/__init__.py +++ b/lib/galaxy/exceptions/__init__.py @@ -104,16 +104,16 @@ 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 -r fff767c478fbce151720d49729d5444f4f85cd28 -r c5b736d3e4e5027391a04fd187e2f9d2aa4ebe46 lib/galaxy/webapps/galaxy/buildapp.py --- a/lib/galaxy/webapps/galaxy/buildapp.py +++ b/lib/galaxy/webapps/galaxy/buildapp.py @@ -192,7 +192,6 @@ 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 @@ 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 ===== Repository URL: https://bitbucket.org/galaxy/galaxy-central/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email.