Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Rex Dri
Rex Dri
Commits
fbe13e6e
Commit
fbe13e6e
authored
Aug 28, 2018
by
Florent Chehab
Browse files
moderation handling enhanced
parent
02af4292
Pipeline
#26688
passed with stages
in 2 minutes and 48 seconds
Changes
4
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
backend/models/my_model/myModel.py
View file @
fbe13e6e
from
django.db
import
models
from
django.contrib.auth.models
import
User
from
django.contrib.contenttypes.fields
import
GenericRelation
from
.pendingModeration
import
PendingModeration
class
MyModel
(
models
.
Model
):
...
...
@@ -17,6 +19,7 @@ class MyModel(models.Model):
updated_on
=
models
.
DateTimeField
(
null
=
True
)
updated_by
=
models
.
ForeignKey
(
User
,
null
=
True
,
on_delete
=
models
.
SET_NULL
,
related_name
=
'+'
)
pending_moderation
=
GenericRelation
(
PendingModeration
)
class
Meta
:
abstract
=
True
backend/models/my_model/myModelSerializer.py
View file @
fbe13e6e
...
...
@@ -5,6 +5,7 @@ from django.conf import settings
from
django.contrib.contenttypes.models
import
ContentType
from
backend.utils
import
is_member
from
.myModel
import
MyModel
from
.pendingModeration
import
PendingModerationSerializer
class
MyModelSerializer
(
serializers
.
ModelSerializer
):
...
...
@@ -14,6 +15,7 @@ class MyModelSerializer(serializers.ModelSerializer):
format
=
"%Y-%m-%d %H:%M:%S"
,
read_only
=
True
)
moderated_by
=
serializers
.
CharField
(
read_only
=
True
)
updated_by
=
serializers
.
CharField
(
read_only
=
True
)
pending_moderation
=
PendingModerationSerializer
(
many
=
True
,
read_only
=
True
)
# TODO : updated_by_username useless ? See in rest API
updated_by_username
=
serializers
.
SerializerMethodField
(
read_only
=
True
)
...
...
backend/models/my_model/myModelViewSet.py
View file @
fbe13e6e
...
...
@@ -17,7 +17,7 @@ class MyModelViewSet(DictModeViewSet):
to prefetch some table and enhance performances
"""
self
.
mymodel_queryset
=
self
.
queryset
.
prefetch_related
(
'moderated_by'
,
'updated_by'
)
'moderated_by'
,
'updated_by'
,
'pending_moderation'
)
return
self
.
extend_queryset
()
def
extend_queryset
(
self
):
...
...
backend/models/my_model/pendingModeration.py
View file @
fbe13e6e
...
...
@@ -21,6 +21,15 @@ class PendingModeration(models.Model):
class
PendingModerationSerializer
(
serializers
.
ModelSerializer
):
content_type
=
serializers
.
CharField
(
read_only
=
True
)
object_id
=
serializers
.
CharField
(
read_only
=
True
)
updated_by
=
serializers
.
CharField
(
read_only
=
True
)
updated_on
=
serializers
.
DateTimeField
(
format
=
"%Y-%m-%d %H:%M:%S"
,
read_only
=
True
)
new_object
=
serializers
.
JSONField
(
read_only
=
True
)
class
Meta
:
model
=
PendingModeration
fields
=
'__all__'
...
...
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment