Commit b3b7b3b0 authored by Glaucia Schnoeller dos Santos's avatar Glaucia Schnoeller dos Santos

Merge branch 'develop' into 'master'

Develop

See merge request !47
parents f5e5c569 8380b92b
......@@ -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:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment