Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Open sidebar
MOOC packages by hacklab
django-courses
Commits
b3b7b3b0
Commit
b3b7b3b0
authored
Apr 14, 2021
by
Glaucia Schnoeller dos Santos
Browse files
Merge branch 'develop' into 'master'
Develop See merge request
!47
parents
f5e5c569
8380b92b
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
7 deletions
+11
-7
courses/views.py
courses/views.py
+11
-7
No files found.
courses/views.py
View file @
b3b7b3b0
...
...
@@ -172,13 +172,17 @@ class ProfessorMessageViewSet(viewsets.ModelViewSet):
def
get_queryset
(
self
):
queryset
=
super
().
get_queryset
()
query
=
Q
(
Q
(
users
=
self
.
request
.
user
)
|
Q
(
groups__in
=
self
.
request
.
user
.
groups
.
all
())
|
Q
(
professor
=
self
.
request
.
user
)
)
queryset
=
queryset
.
filter
(
query
).
order_by
(
'-id'
).
distinct
()
all_messages
=
self
.
request
.
query_params
.
get
(
'all_messages'
,
None
)
if
all_messages
:
queryset
=
queryset
.
order_by
(
'-id'
).
distinct
()
else
:
query
=
Q
(
Q
(
users
=
self
.
request
.
user
)
|
Q
(
groups__in
=
self
.
request
.
user
.
groups
.
all
())
|
Q
(
professor
=
self
.
request
.
user
)
)
queryset
=
queryset
.
filter
(
query
).
order_by
(
'-id'
).
distinct
()
classroom
=
self
.
request
.
query_params
.
get
(
'classroom'
,
None
)
if
classroom
:
...
...
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