From 16b82e0a8d058dd73d3c21a4448246f6d9a54b9d Mon Sep 17 00:00:00 2001 From: Paul Marillonnet Date: Fri, 12 Jan 2018 10:56:29 +0100 Subject: [PATCH] rename role membership API class (pre-#20706) --- src/authentic2/api_urls.py | 4 ++-- src/authentic2/api_views.py | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/authentic2/api_urls.py b/src/authentic2/api_urls.py index 7175e148..61e6d9df 100644 --- a/src/authentic2/api_urls.py +++ b/src/authentic2/api_urls.py @@ -9,8 +9,8 @@ urlpatterns = patterns('', name='a2-api-password-change'), url(r'^user/$', api_views.user, name='a2-api-user'), - url(r'^roles/(?P[\w+]*)/members/(?P[^/]+)/$', api_views.roles, - name='a2-api-role-member'), + url(r'^roles/(?P[\w+]*)/members/(?P[^/]+)/$', + api_views.role_memberships, name='a2-api-role-member'), url(r'^check-password/$', api_views.check_password, name='a2-api-check-password'), ) diff --git a/src/authentic2/api_views.py b/src/authentic2/api_views.py index 928cb8e4..95fb99ee 100644 --- a/src/authentic2/api_views.py +++ b/src/authentic2/api_views.py @@ -576,11 +576,11 @@ class UsersAPI(HookMixin, ExceptionHandlerMixin, ModelViewSet): return Response({'result': 1}) -class RolesAPI(ExceptionHandlerMixin, APIView): +class RoleMembershipsAPI(ExceptionHandlerMixin, APIView): permission_classes = (permissions.IsAuthenticated,) def initial(self, request, *args, **kwargs): - super(RolesAPI, self).initial(request, *args, **kwargs) + super(RoleMembershipsAPI, self).initial(request, *args, **kwargs) Role = get_role_model() User = get_user_model() self.role = get_object_or_404(Role, uuid=kwargs['role_uuid']) @@ -601,7 +601,7 @@ class RolesAPI(ExceptionHandlerMixin, APIView): return Response({'result': 1, 'detail': _('User successfully removed from role')}, status=status.HTTP_200_OK) -roles = RolesAPI.as_view() +role_memberships = RoleMembershipsAPI.as_view() class BaseOrganizationalUnitSerializer(serializers.ModelSerializer): -- 2.11.0