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
7dcbf6fb
Commit
7dcbf6fb
authored
Apr 14, 2021
by
Matheus Miranda
Browse files
Merge branch 'develop' into 'master'
Fix messages visualization See merge request
!49
parents
8240405d
0464c091
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
11 deletions
+12
-11
courses/models.py
courses/models.py
+1
-1
courses/views.py
courses/views.py
+11
-10
No files found.
courses/models.py
View file @
7dcbf6fb
...
...
@@ -766,7 +766,7 @@ class ProfessorMessage(models.Model):
)
def
__str__
(
self
):
return
self
.
professor
.
name
+
" - "
+
self
.
subject
+
" - "
+
str
(
self
.
date
)
return
self
.
subject
+
" - "
+
str
(
self
.
date
)
def
send
(
self
):
# bcc = list with all destinataries
...
...
courses/views.py
View file @
7dcbf6fb
...
...
@@ -173,17 +173,18 @@ class ProfessorMessageViewSet(viewsets.ModelViewSet):
def
get_queryset
(
self
):
queryset
=
super
().
get_queryset
()
all_messages
=
self
.
request
.
query_params
.
get
(
'all_messages'
,
None
)
if
all_messages
:
queryset
=
queryset
.
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
()
# 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()
queryset
=
queryset
.
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