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

LIL-582

See merge request lilcity/backend!109
remotes/origin/hotfix/LIL-661
cfwme 8 years ago
commit 43b84fc1c3
  1. 5
      api/v1/views.py
  2. 14
      apps/content/templates/content/contest.html

@ -477,7 +477,8 @@ class ContestWorkViewSet(ExtendedModelViewSet):
authentication_classes = []
def create(self, request, *args, **kwargs):
# FIXME in prod: fixed
if ContestWork.objects.filter(user=request.user).exists():
# FIXME
user = User.objects.get(pk=request.data.get('user'))
if ContestWork.objects.filter(user=user).exists():
return Response(status=status.HTTP_400_BAD_REQUEST)
return super().create(request, *args, **kwargs)

@ -12,9 +12,11 @@
{{ contest.description }}
</div>
<div class="main__actions">
<a class="main__btn btn" href=""
{% if request.user.is_authenticated and not contest_work_uploaded %}data-show-upload-contest-work{% else %}data-popup=".js-popup-auth"{% endif %}>Загрузить свою работу</a>
{% if not contest_work_uploaded %}
<a class="main__btn btn" href=""
{% if request.user.is_authenticated %}data-show-upload-contest-work
{% else %}data-popup=".js-popup-auth"{% endif %}>Загрузить свою работу</a>
{% endif %}
</div>
</div>
</div>
@ -32,9 +34,11 @@
<div class="title title_center">Галерея</div>
</a>
<div class="text">
<a class="main__btn btn" href=""
{% if request.user.is_authenticated and not contest_work_uploaded %}data-show-upload-contest-work
{% if not contest_work_uploaded %}
<a class="btn" href=""
{% if request.user.is_authenticated %}data-show-upload-contest-work
{% else %}data-popup=".js-popup-auth"{% endif %}>Загрузить свою работу</a>
{% endif %}
</div>
<contest-works contest-id="{{ contest.id }}" autoload="true"></contest-works>
</div>

Loading…
Cancel
Save