From 4da1f1dcd883620129f938360fc5e4305564aae4 Mon Sep 17 00:00:00 2001 From: gzbender Date: Thu, 16 Aug 2018 00:43:43 +0500 Subject: [PATCH 1/2] LIL-582 fixes for prod --- api/v1/serializers/course.py | 6 +++--- api/v1/views.py | 6 +++--- apps/content/templates/content/contest.html | 3 +-- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/api/v1/serializers/course.py b/api/v1/serializers/course.py index c3921890..573b0f76 100644 --- a/api/v1/serializers/course.py +++ b/api/v1/serializers/course.py @@ -90,9 +90,9 @@ class LikeCreateSerializer(serializers.ModelSerializer): obj_id = validated_data.pop('obj_id') if obj_type == self.OBJ_TYPE_CONTEST_WORK: contest_work = ContestWork.objects.get(pk=obj_id) - # FIXME in prod: - # if contest_work.user == user or contest_work.likes.filter(user=user).exists(): - if contest_work.likes.filter(user=user).exists(): + # FIXME in prod: fixed + if contest_work.user == user or contest_work.likes.filter(user=user).exists(): + # if contest_work.likes.filter(user=user).exists(): return Like() like = Like.objects.create(user=user) contest_work.likes.add(like) diff --git a/api/v1/views.py b/api/v1/views.py index e9fa7859..62b3725e 100644 --- a/api/v1/views.py +++ b/api/v1/views.py @@ -477,7 +477,7 @@ class ContestWorkViewSet(ExtendedModelViewSet): authentication_classes = [] def create(self, request, *args, **kwargs): - # FIXME in prod: - # if ContestWork.objects.filter(user=request.user).exists(): - # return Response(status=status.HTTP_400_BAD_REQUEST) + # FIXME in prod: fixed + if ContestWork.objects.filter(user=request.user).exists(): + return Response(status=status.HTTP_400_BAD_REQUEST) return super().create(request, *args, **kwargs) diff --git a/apps/content/templates/content/contest.html b/apps/content/templates/content/contest.html index 0d8a4ad4..2f724e46 100644 --- a/apps/content/templates/content/contest.html +++ b/apps/content/templates/content/contest.html @@ -14,8 +14,7 @@
Загрузить свою работу + {% if request.user.is_authenticated and not contest_work_uploaded %}data-show-upload-contest-work{% else %}data-popup=".js-popup-auth"{% endif %}>Загрузить свою работу
From a5523e8bf34e55e57bd03720798e8b5bae198c90 Mon Sep 17 00:00:00 2001 From: gzbender Date: Thu, 16 Aug 2018 00:53:43 +0500 Subject: [PATCH 2/2] LIL-582 --- apps/content/templates/content/contest_work.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/content/templates/content/contest_work.html b/apps/content/templates/content/contest_work.html index 1fe09942..67e2e287 100644 --- a/apps/content/templates/content/contest_work.html +++ b/apps/content/templates/content/contest_work.html @@ -74,7 +74,7 @@
-
Задавайте вопросы:
+
Оставьте комментарий:
{% if request.user.is_authenticated %}
@@ -95,7 +95,7 @@ Отменить
- +