From 744d252640fd89ff9c8ea7a0164d8e941c81520d Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Fri, 22 Feb 2019 04:04:16 -0400 Subject: [PATCH] Update classes and API URLs for uniformity Signed-off-by: Roberto Rosario --- mayan/apps/permissions/api_views.py | 4 ++-- mayan/apps/permissions/serializers.py | 4 ++-- mayan/apps/permissions/urls.py | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/mayan/apps/permissions/api_views.py b/mayan/apps/permissions/api_views.py index 3e0f079551..80829f1680 100644 --- a/mayan/apps/permissions/api_views.py +++ b/mayan/apps/permissions/api_views.py @@ -20,7 +20,7 @@ from .serializers import ( ) -class PermissionNamespaceViewSet(viewsets.ReadOnlyModelViewSet): +class PermissionNamespaceAPIViewSet(viewsets.ReadOnlyModelViewSet): lookup_field = 'name' lookup_url_kwarg = 'permission_namespace_name' serializer_class = PermissionNamespaceSerializer @@ -51,7 +51,7 @@ class PermissionNamespaceViewSet(viewsets.ReadOnlyModelViewSet): return PermissionNamespace.all() -class PermissionViewSet(viewsets.ReadOnlyModelViewSet): +class PermissionAPIViewSet(viewsets.ReadOnlyModelViewSet): lookup_field = 'pk' lookup_url_kwarg = 'permission_name' lookup_value_regex = r'[\w\.]+' diff --git a/mayan/apps/permissions/serializers.py b/mayan/apps/permissions/serializers.py index f4127e7ded..aed71a51c5 100644 --- a/mayan/apps/permissions/serializers.py +++ b/mayan/apps/permissions/serializers.py @@ -16,7 +16,7 @@ from .models import Role, StoredPermission class PermissionNamespaceSerializer(serializers.Serializer): name = serializers.CharField(read_only=True) label = serializers.CharField(read_only=True) - permissions_url = serializers.HyperlinkedIdentityField( + permission_list_url = serializers.HyperlinkedIdentityField( lookup_field='name', lookup_url_kwarg='permission_namespace_name', view_name='rest_api:permission_namespace-permission-list' @@ -29,7 +29,7 @@ class PermissionNamespaceSerializer(serializers.Serializer): class PermissionSerializer(serializers.Serializer): - namespace = serializers.CharField(read_only=True) + permission_namespace = PermissionNamespaceSerializer(source='namespace') pk = serializers.CharField(read_only=True) label = serializers.CharField(read_only=True) url = MultiKwargHyperlinkedIdentityField( diff --git a/mayan/apps/permissions/urls.py b/mayan/apps/permissions/urls.py index 4e1dd44d86..93bb403783 100644 --- a/mayan/apps/permissions/urls.py +++ b/mayan/apps/permissions/urls.py @@ -3,7 +3,7 @@ from __future__ import unicode_literals from django.conf.urls import url from .api_views import ( - PermissionNamespaceViewSet, PermissionViewSet, RoleAPIViewSet + PermissionNamespaceAPIViewSet, PermissionAPIViewSet, RoleAPIViewSet ) from .views import ( GroupRolesView, RoleCreateView, RoleDeleteView, RoleEditView, @@ -40,12 +40,12 @@ urlpatterns = [ api_router_entries = ( { - 'prefix': r'permission_namespaces', 'viewset': PermissionNamespaceViewSet, + 'prefix': r'permission_namespaces', 'viewset': PermissionNamespaceAPIViewSet, 'basename': 'permission_namespace' }, { 'prefix': r'permission_namespaces/(?P[^/.]+)/permissions', - 'viewset': PermissionViewSet, 'basename': 'permission' + 'viewset': PermissionAPIViewSet, 'basename': 'permission' }, {'prefix': r'roles', 'viewset': RoleAPIViewSet, 'basename': 'role'}, )