Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Rex Dri
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
32
Issues
32
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Rex Dri
Rex Dri
Commits
60184081
Commit
60184081
authored
Feb 26, 2019
by
Florent Chehab
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Renamed my_pre_save to do_before_save
Also: fixed self.user not being set anymore
parent
fd1835e9
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
20 additions
and
9 deletions
+20
-9
backend/backend_app/models/abstract/my_model/myModelSerializer.py
...backend_app/models/abstract/my_model/myModelSerializer.py
+10
-6
backend/backend_app/models/user/userData.py
backend/backend_app/models/user/userData.py
+10
-3
No files found.
backend/backend_app/models/abstract/my_model/myModelSerializer.py
View file @
60184081
...
...
@@ -89,6 +89,12 @@ class MyModelSerializer(MySerializerWithJSON):
class
Meta
:
model
=
MyModel
def
get_user_from_request
(
self
):
"""
Function to retrieve the user from the request
"""
return
self
.
context
[
"request"
].
user
def
validate
(
self
,
attrs
):
"""
Validate `MyModel` fields and enforce certain field at the backend level.
...
...
@@ -100,8 +106,7 @@ class MyModelSerializer(MySerializerWithJSON):
requested_obj_moder_lv
=
attrs
[
"obj_moderation_level"
]
try
:
user
=
self
.
context
[
"request"
].
user
user_level
=
get_user_level
(
user
)
user_level
=
get_user_level
(
self
.
get_user_from_request
())
except
KeyError
:
# if for some reason we don't have the user in the request
# we set the level to the default one
...
...
@@ -139,11 +144,10 @@ class MyModelSerializer(MySerializerWithJSON):
for
key
in
new_data
:
self
.
validated_data
[
key
]
=
new_data
[
key
]
def
my_p
re_save
(
self
):
def
do_befo
re_save
(
self
):
"""
TODO, Analyse if useful
l
Action to perform before saving a mode
l
"""
pass
def
save
(
self
,
*
args
,
**
kwargs
):
...
...
@@ -157,7 +161,7 @@ class MyModelSerializer(MySerializerWithJSON):
user_level
=
get_user_level
(
user
)
self
.
clean_validated_data
()
self
.
my_p
re_save
()
self
.
do_befo
re_save
()
ct
=
ContentType
.
objects
.
get_for_model
(
self
.
Meta
.
model
)
if
is_moderation_required
(
...
...
backend/backend_app/models/user/userData.py
View file @
60184081
...
...
@@ -36,11 +36,18 @@ class UserDataSerializer(MyModelSerializer):
def
get_owner_can_post_to
(
self
,
obj
):
return
list_user_post_permission
(
obj
.
owner
)
def
my_pre_save
(
self
):
self
.
override_validated_data
({
"owner"
:
self
.
user
})
def
do_before_save
(
self
):
"""
For safety: enforce (for sure) that we update the model corresponding to the user/owner.
"""
super
().
do_before_save
()
user
=
self
.
get_user_from_request
()
self
.
override_validated_data
({
"owner"
:
user
})
# we try to recover the correct instance
query
=
UserData
.
objects
.
filter
(
owner
=
self
.
user
)
query
=
UserData
.
objects
.
filter
(
owner
=
user
)
if
len
(
query
)
==
1
:
self
.
instance
=
query
[
0
]
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a 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