Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
beat.web
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
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
beat
beat.web
Commits
84c28ccb
Commit
84c28ccb
authored
4 years ago
by
Samuel GAIST
Browse files
Options
Downloads
Patches
Plain Diff
[accounts][serializers] Pre-commit cleanup
parent
7cc30ca7
No related branches found
No related tags found
1 merge request
!327
Refactor update creation api
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
beat/web/accounts/serializers.py
+20
-20
20 additions, 20 deletions
beat/web/accounts/serializers.py
with
20 additions
and
20 deletions
beat/web/accounts/serializers.py
+
20
−
20
View file @
84c28ccb
...
...
@@ -25,20 +25,13 @@
# #
###############################################################################
from
django.contrib.auth.models
import
User
,
AnonymousUser
from
django.contrib.auth.models
import
User
from
rest_framework
import
serializers
from
.models
import
Profile
,
SupervisionTrack
from
..common.models
import
Contribution
from
..common.fields
import
JSONSerializerField
from
..ui.templatetags.markup
import
restructuredtext
from
..common.utils
import
validate_restructuredtext
import
simplejson
as
json
from
.models
import
SupervisionTrack
#----------------------------------------------------------
#
----------------------------------------------------------
class
UserSerializer
(
serializers
.
ModelSerializer
):
...
...
@@ -47,7 +40,7 @@ class UserSerializer(serializers.ModelSerializer):
class
Meta
:
model
=
User
fields
=
[
'
username
'
,
'
email
'
]
fields
=
[
"
username
"
,
"
email
"
]
def
get_username
(
self
,
obj
):
return
obj
.
username
...
...
@@ -56,7 +49,7 @@ class UserSerializer(serializers.ModelSerializer):
return
obj
.
email
#----------------------------------------------------------
#
----------------------------------------------------------
class
BasicSupervisionTrackSerializer
(
serializers
.
ModelSerializer
):
...
...
@@ -70,12 +63,12 @@ class BasicSupervisionTrackSerializer(serializers.ModelSerializer):
class
Meta
:
model
=
SupervisionTrack
fields
=
[
'
is_valid
'
]
fields
=
[
"
is_valid
"
]
#def get_supervisee(self, obj):
#
def get_supervisee(self, obj):
# return obj.supervisee
#def get_supervisor(self, obj):
#
def get_supervisor(self, obj):
# return obj.supervisor
def
get_is_valid
(
self
,
obj
):
...
...
@@ -94,20 +87,27 @@ class BasicSupervisionTrackSerializer(serializers.ModelSerializer):
return
obj
.
supervision_key
#----------------------------------------------------------
#
----------------------------------------------------------
class
FullSupervisionTrackSerializer
(
BasicSupervisionTrackSerializer
):
class
Meta
(
BasicSupervisionTrackSerializer
.
Meta
):
fields
=
[
'
supervisee
'
,
'
supervisor
'
,
'
is_valid
'
,
'
start_date
'
,
'
expiration_date
'
,
'
last_validation_date
'
,
'
supervision_key
'
]
fields
=
[
"
supervisee
"
,
"
supervisor
"
,
"
is_valid
"
,
"
start_date
"
,
"
expiration_date
"
,
"
last_validation_date
"
,
"
supervision_key
"
,
]
#----------------------------------------------------------
#
----------------------------------------------------------
class
SupervisionTrackUpdateSerializer
(
BasicSupervisionTrackSerializer
):
pass
#----------------------------------------------------------
#
----------------------------------------------------------
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