matthias/mayan-edms
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update classes and API URLs for uniformity

Browse Source 
Signed-off-by: Roberto Rosario <Roberto.Rosario@mayan-edms.com>
This commit is contained in:
Roberto Rosario
2019-02-22 04:04:16 -04:00
parent d74d13450c
commit 744d252640
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mayan/apps/permissions/api_views.py
View File

@@ -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\.]+'

4
mayan/apps/permissions/serializers.py
View File

@@ -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(

6
mayan/apps/permissions/urls.py
View File

@@ -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<permission_namespace_name>[^/.]+)/permissions',
'viewset': PermissionViewSet, 'basename': 'permission'
'viewset': PermissionAPIViewSet, 'basename': 'permission'
},
{'prefix': r'roles', 'viewset': RoleAPIViewSet, 'basename': 'role'},
)