Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
Backend
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Container Registry
Analyze
Contributor analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Arkindex
Backend
Commits
63f147c7
Commit
63f147c7
authored
4 years ago
by
Valentin Rigal
Browse files
Options
Downloads
Patches
Plain Diff
Rename endpoint to ListGroupMemberships
parent
ffd5476d
Loading
Loading
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
arkindex/project/api_v1.py
+2
-2
2 additions, 2 deletions
arkindex/project/api_v1.py
arkindex/users/api.py
+3
-3
3 additions, 3 deletions
arkindex/users/api.py
arkindex/users/serializers.py
+1
-1
1 addition, 1 deletion
arkindex/users/serializers.py
with
6 additions
and
6 deletions
arkindex/project/api_v1.py
+
2
−
2
View file @
63f147c7
...
...
@@ -86,7 +86,7 @@ from arkindex.project.openapi import SchemaGenerator
from
arkindex.users.api
import
(
CredentialsList
,
CredentialsRetrieve
,
GroupMembersList
,
GroupMembers
hips
List
,
GroupsList
,
JobList
,
JobRetrieve
,
...
...
@@ -249,7 +249,7 @@ api = [
# Rights management
path
(
'
groups/
'
,
GroupsList
.
as_view
(),
name
=
'
groups-list
'
),
path
(
'
group/<uuid:pk>/members/
'
,
GroupMembersList
.
as_view
(),
name
=
'
group-members
'
),
path
(
'
group/<uuid:pk>/members/
'
,
GroupMembers
hips
List
.
as_view
(),
name
=
'
group-members
'
),
# Asynchronous jobs
path
(
'
jobs/
'
,
JobList
.
as_view
(),
name
=
'
jobs-list
'
),
...
...
This diff is collapsed.
Click to expand it.
arkindex/users/api.py
+
3
−
3
View file @
63f147c7
...
...
@@ -36,7 +36,7 @@ from arkindex.users.models import Group, OAuthStatus, Scope, User, UserScope
from
arkindex.users.providers
import
get_provider
,
oauth_providers
from
arkindex.users.serializers
import
(
EmailLoginSerializer
,
GroupMemberSerializer
,
GroupMember
ships
Serializer
,
GroupSerializer
,
JobSerializer
,
NewUserSerializer
,
...
...
@@ -505,11 +505,11 @@ class JobRetrieve(RetrieveDestroyAPIView):
instance
.
delete
()
class
GroupMembersList
(
ListAPIView
):
class
GroupMembers
hips
List
(
ListAPIView
):
"""
List members of a group to wich user belongs with their privileges
"""
serializer_class
=
GroupMemberSerializer
serializer_class
=
GroupMember
ships
Serializer
permission_classes
=
(
IsVerified
,
)
openapi_overrides
=
{
'
security
'
:
[],
...
...
This diff is collapsed.
Click to expand it.
arkindex/users/serializers.py
+
1
−
1
View file @
63f147c7
...
...
@@ -260,7 +260,7 @@ class JobSerializer(serializers.Serializer):
return
instance
.
get_status
(
refresh
=
False
)
class
GroupMemberSerializer
(
serializers
.
ModelSerializer
):
class
GroupMember
ships
Serializer
(
serializers
.
ModelSerializer
):
id
=
serializers
.
StringRelatedField
(
source
=
'
user.id
'
)
display_name
=
serializers
.
StringRelatedField
(
source
=
'
user.display_name
'
)
email
=
serializers
.
StringRelatedField
(
source
=
'
user.email
'
)
...
...
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