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
ac56d059
Commit
ac56d059
authored
Sep 02, 2018
by
Florent Chehab
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
New moderation protocols operationnal
parent
7cc17dfe
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
21 additions
and
13 deletions
+21
-13
backend/models/my_model/myModelSerializer.py
backend/models/my_model/myModelSerializer.py
+12
-12
backend/models/user/userData.py
backend/models/user/userData.py
+0
-1
backend/utils/__init__.py
backend/utils/__init__.py
+1
-0
backend/utils/does_user_have_moderation_rights.py
backend/utils/does_user_have_moderation_rights.py
+8
-0
No files found.
backend/models/my_model/myModelSerializer.py
View file @
ac56d059
...
...
@@ -3,7 +3,7 @@ from django.utils import timezone
from
.pendingModeration
import
PendingModeration
from
django.conf
import
settings
from
django.contrib.contenttypes.models
import
ContentType
from
backend.utils
import
is_member
from
backend.utils
import
does_user_have_moderation_rights
from
.myModel
import
MyModel
from
.pendingModeration
import
PendingModerationSerializer
...
...
@@ -50,20 +50,20 @@ class MyModelSerializer(serializers.ModelSerializer):
model
=
MyModel
def
moderation_required
(
self
):
if
hasattr
(
self
.
Meta
,
'NEVER_MODERATE'
)
and
self
.
Meta
.
NEVER_MODERATE
:
return
False
moderation_level
=
self
.
Meta
.
model
.
moderation_level
user
=
self
.
get_user_in_request
()
request
=
self
.
context
[
'request'
]
if
user
.
is_staff
:
if
moderation_level
==
0
:
return
False
if
settings
.
MODERATION_ACTIVATED
:
if
request
.
method
in
[
'POST'
,
'PUT'
]:
# should be always the case
return
not
is_member
(
'Moderators'
,
request
.
user
)
return
False
elif
moderation_level
==
1
:
if
settings
.
MODERATION_ACTIVATED
:
return
not
does_user_have_moderation_rights
(
user
)
else
:
return
False
elif
moderation_level
==
2
:
return
not
does_user_have_moderation_rights
(
user
)
else
:
raise
Exception
(
"No other moderation level should be defined..."
)
def
get_user_in_request
(
self
):
return
self
.
context
[
'request'
].
user
...
...
backend/models/user/userData.py
View file @
ac56d059
...
...
@@ -34,7 +34,6 @@ class UserDataSerializer(MyModelSerializer):
class
Meta
:
model
=
UserData
fields
=
'__all__'
NEVER_MODERATE
=
True
class
UserDataViewSet
(
MyModelViewSet
):
...
...
backend/utils/__init__.py
View file @
ac56d059
...
...
@@ -3,3 +3,4 @@ from .file import read_file, write_file # noqa: F401
from
.find_api_end_point_for_viewset
import
find_api_end_point_for_viewset
# noqa: F401
from
.get_moderation_level
import
get_moderation_level
# noqa: F401
from
.get_viewset_permissions
import
get_viewset_permissions
# noqa: F401
from
.does_user_have_moderation_rights
import
does_user_have_moderation_rights
# noqa: F401
backend/utils/does_user_have_moderation_rights.py
0 → 100644
View file @
ac56d059
from
.is_member
import
is_member
def
does_user_have_moderation_rights
(
user
):
"""
TODO unit test
"""
return
user
.
is_staff
or
is_member
(
'DRI'
,
user
)
or
is_member
(
'Moderators'
,
user
)
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