Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
nk20
Manage
Activity
Members
Labels
Plan
Issues
32
Issue boards
Milestones
Wiki
Code
Merge requests
6
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
BDE
nk20
Commits
0cdc8ae0
Commit
0cdc8ae0
authored
4 years ago
by
ynerant
Browse files
Options
Downloads
Patches
Plain Diff
RolePermissions were missing in the API
parent
17ea2246
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!71
Memberships
Pipeline
#8088
passed with stages
Stage: test
Stage: quality-assurance
in 3 minutes and 32 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
apps/permission/api/serializers.py
+12
-1
12 additions, 1 deletion
apps/permission/api/serializers.py
apps/permission/api/urls.py
+3
-2
3 additions, 2 deletions
apps/permission/api/urls.py
apps/permission/api/views.py
+16
-4
16 additions, 4 deletions
apps/permission/api/views.py
with
31 additions
and
7 deletions
apps/permission/api/serializers.py
+
12
−
1
View file @
0cdc8ae0
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
from
rest_framework
import
serializers
from
rest_framework
import
serializers
from
..models
import
Permission
from
..models
import
Permission
,
RolePermissions
class
PermissionSerializer
(
serializers
.
ModelSerializer
):
class
PermissionSerializer
(
serializers
.
ModelSerializer
):
...
@@ -15,3 +15,14 @@ class PermissionSerializer(serializers.ModelSerializer):
...
@@ -15,3 +15,14 @@ class PermissionSerializer(serializers.ModelSerializer):
class
Meta
:
class
Meta
:
model
=
Permission
model
=
Permission
fields
=
'
__all__
'
fields
=
'
__all__
'
class
RolePermissionsSerializer
(
serializers
.
ModelSerializer
):
"""
REST API Serializer for RolePermissions types.
The djangorestframework plugin will analyse the model `RolePermissions` and parse all fields in the API.
"""
class
Meta
:
model
=
RolePermissions
fields
=
'
__all__
'
This diff is collapsed.
Click to expand it.
apps/permission/api/urls.py
+
3
−
2
View file @
0cdc8ae0
# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
# SPDX-License-Identifier: GPL-3.0-or-later
# SPDX-License-Identifier: GPL-3.0-or-later
from
.views
import
PermissionViewSet
from
.views
import
PermissionViewSet
,
RolePermissionsViewSet
def
register_permission_urls
(
router
,
path
):
def
register_permission_urls
(
router
,
path
):
"""
"""
Configure router for permission REST API.
Configure router for permission REST API.
"""
"""
router
.
register
(
path
,
PermissionViewSet
)
router
.
register
(
path
+
"
/permission
"
,
PermissionViewSet
)
router
.
register
(
path
+
"
/roles
"
,
RolePermissionsViewSet
)
This diff is collapsed.
Click to expand it.
apps/permission/api/views.py
+
16
−
4
View file @
0cdc8ae0
...
@@ -4,17 +4,29 @@
...
@@ -4,17 +4,29 @@
from
django_filters.rest_framework
import
DjangoFilterBackend
from
django_filters.rest_framework
import
DjangoFilterBackend
from
api.viewsets
import
ReadOnlyProtectedModelViewSet
from
api.viewsets
import
ReadOnlyProtectedModelViewSet
from
.serializers
import
PermissionSerializer
from
.serializers
import
PermissionSerializer
,
RolePermissionsSerializer
from
..models
import
Permission
from
..models
import
Permission
,
RolePermissions
class
PermissionViewSet
(
ReadOnlyProtectedModelViewSet
):
class
PermissionViewSet
(
ReadOnlyProtectedModelViewSet
):
"""
"""
REST API View set.
REST API View set.
The djangorestframework plugin will get all `
Changelog
` objects, serialize it to JSON with the given serializer,
The djangorestframework plugin will get all `
Permission
` objects, serialize it to JSON with the given serializer,
then render it on /api/
logs
/
then render it on /api/
permission/permission
/
"""
"""
queryset
=
Permission
.
objects
.
all
()
queryset
=
Permission
.
objects
.
all
()
serializer_class
=
PermissionSerializer
serializer_class
=
PermissionSerializer
filter_backends
=
[
DjangoFilterBackend
]
filter_backends
=
[
DjangoFilterBackend
]
filterset_fields
=
[
'
model
'
,
'
type
'
,
]
filterset_fields
=
[
'
model
'
,
'
type
'
,
]
class
RolePermissionsViewSet
(
ReadOnlyProtectedModelViewSet
):
"""
REST API View set.
The djangorestframework plugin will get all `RolePermission` objects, serialize it to JSON with the given serializer
then render it on /api/permission/roles/
"""
queryset
=
RolePermissions
.
objects
.
all
()
serializer_class
=
RolePermissionsSerializer
filter_backends
=
[
DjangoFilterBackend
]
filterset_fields
=
[
'
role
'
,
]
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment