diff --git a/lib/galaxy/webapps/tool_shed/api/categories.py b/lib/galaxy/webapps/tool_shed/api/categories.py index 4293d2f6f4a..b9fb44912da 100644 --- a/lib/galaxy/webapps/tool_shed/api/categories.py +++ b/lib/galaxy/webapps/tool_shed/api/categories.py @@ -17,9 +17,9 @@ class CategoriesController( BaseAPIController ): return value_mapper @web.expose_api - def create_category( self, trans, payload, **kwd ): + def create( self, trans, payload, **kwd ): """ - POST /api/categories/create_category + POST /api/categories Returns a dictionary of information about the created category. : param key: the current Galaxy admin user's API key diff --git a/lib/galaxy/webapps/tool_shed/api/users.py b/lib/galaxy/webapps/tool_shed/api/users.py index 2690f80153f..a3855141bf0 100644 --- a/lib/galaxy/webapps/tool_shed/api/users.py +++ b/lib/galaxy/webapps/tool_shed/api/users.py @@ -16,9 +16,9 @@ class UsersController( BaseAPIController ): """RESTful controller for interactions with users in the Tool Shed.""" @web.expose_api - def create_user( self, trans, payload, **kwd ): + def create( self, trans, payload, **kwd ): """ - POST /api/users/create_user + POST /api/users Returns a dictionary of information about the created user. : param key: the current Galaxy admin user's API key diff --git a/lib/galaxy/webapps/tool_shed/buildapp.py b/lib/galaxy/webapps/tool_shed/buildapp.py index bf157c19b6a..5300a70cf40 100644 --- a/lib/galaxy/webapps/tool_shed/buildapp.py +++ b/lib/galaxy/webapps/tool_shed/buildapp.py @@ -85,7 +85,6 @@ def app_factory( global_conf, **kwargs ): controller='categories', name_prefix='category_', path_prefix='/api', - new={ 'create_category' : 'POST' }, parent_resources=dict( member_name='category', collection_name='categories' ) ) webapp.mapper.resource( 'repository', 'repositories', @@ -112,7 +111,6 @@ def app_factory( global_conf, **kwargs ): controller='users', name_prefix='user_', path_prefix='/api', - new={ 'create_user' : 'POST' }, parent_resources=dict( member_name='user', collection_name='users' ) ) webapp.finalize_config() # Wrap the webapp in some useful middleware diff --git a/lib/tool_shed/scripts/api/create_categories.py b/lib/tool_shed/scripts/api/create_categories.py index 1c908659689..3b44550fdc7 100644 --- a/lib/tool_shed/scripts/api/create_categories.py +++ b/lib/tool_shed/scripts/api/create_categories.py @@ -39,7 +39,7 @@ def main( options ): if name is not None and description is not None: data = dict( name=name, description=description ) - url = '%s/api/categories/new/create_category' % to_tool_shed + url = '%s/api/categories' % to_tool_shed try: response = submit( url, data, api_key ) except Exception, e: diff --git a/lib/tool_shed/scripts/api/create_users.py b/lib/tool_shed/scripts/api/create_users.py index fd5148f7eb6..588d9684255 100644 --- a/lib/tool_shed/scripts/api/create_users.py +++ b/lib/tool_shed/scripts/api/create_users.py @@ -42,7 +42,7 @@ def main( options ): data = dict( email=email, password=password, username=username ) - url = '%s/api/users/new/create_user' % to_tool_shed + url = '%s/api/users' % to_tool_shed try: response = submit( url, data, api_key ) except Exception, e: