michal/movieclub
1
0
Fork 0
Code Issues Pull Requests Releases Activity

fix after changing null -> blank

Browse Source
This commit is contained in:
Michal Kunc 2023-02-17 15:21:04 +01:00
parent c84ae1334e
commit 947d9f740c
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
templates/watchlist/movie_detail.html
View File

@ -14,7 +14,7 @@
<p>Total score: {{ movie.score }}, seen by: {{ movie.seen_score }}. <p>Total score: {{ movie.score }}, seen by: {{ movie.seen_score }}.
<ul> <ul>
{% for vote in votes %} {% for vote in votes %}
<li>{{vote.user.username}} {% if vote.seen %}(seen){% endif %} &ndash; {% if vote.vote == 1 %}👍{% elif vote.vote == 0 %}No opinion{% elif vote.vote == -1 %}👎{%endif%}{% if vote.comment is not None %} &ndash; {{vote.comment}}{% endif %}</li> <li>{{vote.user.username}} {% if vote.seen %}(seen){% endif %} &ndash; {% if vote.vote == 1 %}👍{% elif vote.vote == 0 %}No opinion{% elif vote.vote == -1 %}👎{%endif%}{% if vote.comment != "" %} &ndash; {{vote.comment}}{% endif %}</li>
{% endfor %} {% endfor %}
</ul> </ul>
{% endif %} {% endif %}

4
watchlist/tests/test_views.py
View File

@ -166,10 +166,10 @@ class VoteTests(TestCase):
with self.subTest(comment=comment): with self.subTest(comment=comment):
response = self.client.post(reverse('watchlist:vote', args=(m.id,)), data={"vote": "0", "comment": comment}) response = self.client.post(reverse('watchlist:vote', args=(m.id,)), data={"vote": "0", "comment": comment})
mv = m.movievote_set.get(user=self.user) mv = m.movievote_set.get(user=self.user)
self.assertEqual(mv.comment, None if comment == "" else comment) self.assertEqual(mv.comment, comment)
with self.subTest(comment=None): with self.subTest(comment=None):
response = self.client.post(reverse('watchlist:vote', args=(m.id,)), data={"vote": "0"}) response = self.client.post(reverse('watchlist:vote', args=(m.id,)), data={"vote": "0"})
mv = m.movievote_set.get(user=self.user) mv = m.movievote_set.get(user=self.user)
self.assertEqual(mv.comment, None) self.assertEqual(mv.comment, "")

4
watchlist/views.py
View File

@ -56,9 +56,7 @@ def vote(request, pk):
user_vote.vote = request.POST['vote'] user_vote.vote = request.POST['vote']
user_vote.seen = request.POST.get('seen', False) == "on" user_vote.seen = request.POST.get('seen', False) == "on"
comment = request.POST.get('comment', '').strip() comment = request.POST.get('comment', '').strip()
if comment != '' or user_vote.comment is not None: if comment != '' or user_vote.comment != "":
if comment == '':
comment = None
user_vote.comment = comment user_vote.comment = comment
user_vote.save() user_vote.save()
return HttpResponseRedirect(reverse('watchlist:index')) return HttpResponseRedirect(reverse('watchlist:index'))