Merge branch 'feature/LIL-582' into 'master'

Feature/lil 582

See merge request lilcity/backend!106

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)

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)

apps/content/templates/content/contest.html

@@ -14,8 +14,7 @@
       <div class="main__actions">
 
         <a class="main__btn btn" href=""
-           {# FIXME in prod: if request.user.is_authenticated and not contest_work_uploaded #}
-           {% if request.user.is_authenticated %}data-show-upload-contest-work{% else %}data-popup=".js-popup-auth"{% endif %}>Загрузить свою работу</a>
+           {% if request.user.is_authenticated and not contest_work_uploaded %}data-show-upload-contest-work{% else %}data-popup=".js-popup-auth"{% endif %}>Загрузить свою работу</a>
       </div>
     </div>
   </div>

apps/content/templates/content/contest_work.html

@@ -74,7 +74,7 @@
 
 <div class="section section_gray">
   <div class="section__center center center_sm">
-    <div class="title">Задавайте вопросы:</div>
+    <div class="title">Оставьте комментарий:</div>
     <div class="questions">
       {% if request.user.is_authenticated %}
       <form class="questions__form" method="post" action="{% url 'contest_work_comment' contest_work_id=contest_work.id %}">
@@ -95,7 +95,7 @@
             <a href="#" class="questions__reply-cancel grey-link">Отменить</a>
           </div>
           <div class="questions__field">
-            <textarea class="questions__textarea" placeholder="Спросите автора курса интересующие вас вопросы"></textarea>
+            <textarea class="questions__textarea"></textarea>
           </div>
           <button class="questions__btn btn btn_light">ОТПРАВИТЬ</button>
         </div>