diff --git a/api/v1/views.py b/api/v1/views.py index 1ad1a679..96a0255a 100644 --- a/api/v1/views.py +++ b/api/v1/views.py @@ -454,6 +454,7 @@ class ObjectCommentsViewSet(ExtendedModelViewSet): queryset = Comment.objects.all() serializer_class = CommentCreateSerializer permission_classes = (IsAuthorObjectOrAdmin,) + ordering_fields = ('update_at', ) def get_queryset(self): queryset = self.queryset @@ -470,7 +471,7 @@ class ObjectCommentsViewSet(ExtendedModelViewSet): queryset = queryset.filter(deactivated_at__isnull=True) elif is_deactivated == '2': queryset = queryset.filter(deactivated_at__isnull=False) - return queryset.order_by('update_at') + return queryset def get_serializer_class(self): if self.request.method == 'POST': diff --git a/apps/course/templates/course/lesson.html b/apps/course/templates/course/lesson.html index 8e30ea5a..d36219f7 100644 --- a/apps/course/templates/course/lesson.html +++ b/apps/course/templates/course/lesson.html @@ -118,13 +118,7 @@
Задавайте вопросы:
- - +
diff --git a/apps/school/templates/school/livelesson_detail.html b/apps/school/templates/school/livelesson_detail.html index fc483b02..96db3a06 100644 --- a/apps/school/templates/school/livelesson_detail.html +++ b/apps/school/templates/school/livelesson_detail.html @@ -21,7 +21,8 @@ mozallowfullscreen allowfullscreen> Если видео не загрузилось, - уменьшите качество видео или обновите страницу - + + {% else %} {% if livelesson.cover %} diff --git a/web/src/components/Comment.vue b/web/src/components/Comment.vue index 279992f9..376d1788 100644 --- a/web/src/components/Comment.vue +++ b/web/src/components/Comment.vue @@ -9,7 +9,7 @@
- +
@@ -24,13 +24,13 @@
- - + +
-