From e3783deb17dbd608d55fb280d32bb8488f547cb3 Mon Sep 17 00:00:00 2001 From: davelopez <46503462+davelopez@users.noreply.github.com> Date: Fri, 19 Feb 2021 14:25:28 +0100 Subject: [PATCH] Replace the old legacy_expose_api decorators --- lib/galaxy/webapps/galaxy/api/group_users.py | 21 +++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/lib/galaxy/webapps/galaxy/api/group_users.py b/lib/galaxy/webapps/galaxy/api/group_users.py index b978b8617d2..123d8640402 100644 --- a/lib/galaxy/webapps/galaxy/api/group_users.py +++ b/lib/galaxy/webapps/galaxy/api/group_users.py @@ -3,8 +3,11 @@ API operations on Group objects. """ import logging -from galaxy import web from galaxy.util import unicodify +from galaxy.web import ( + expose_api, + require_admin, +) from galaxy.webapps.base.controller import BaseAPIController, url_for log = logging.getLogger(__name__) @@ -12,8 +15,8 @@ log = logging.getLogger(__name__) class GroupUsersAPIController(BaseAPIController): - @web.require_admin - @web.legacy_expose_api + @require_admin + @expose_api def index(self, trans, group_id, **kwd): """ GET /api/groups/{encoded_group_id}/users @@ -41,8 +44,8 @@ class GroupUsersAPIController(BaseAPIController): trans.response.status = 500 return rval - @web.require_admin - @web.legacy_expose_api + @require_admin + @expose_api def show(self, trans, id, group_id, **kwd): """ GET /api/groups/{encoded_group_id}/users/{encoded_user_id} @@ -67,8 +70,8 @@ class GroupUsersAPIController(BaseAPIController): log.error(item + ": %s", unicodify(e)) return item - @web.require_admin - @web.legacy_expose_api + @require_admin + @expose_api def update(self, trans, id, group_id, **kwd): """ PUT /api/groups/{encoded_group_id}/users/{encoded_user_id} @@ -99,8 +102,8 @@ class GroupUsersAPIController(BaseAPIController): log.error(item + ": %s", unicodify(e)) return item - @web.require_admin - @web.legacy_expose_api + @require_admin + @expose_api def delete(self, trans, id, group_id, **kwd): """ DELETE /api/groups/{encoded_group_id}/users/{encoded_user_id}