beta 5.2

Several Bug Fixes

Author: Arjun

db.sqlite3

@@ -7,3 +7,4 @@
 admin.site.register(Comment)
 admin.site.register(Tag)
 admin.site.register(UserProfile)
+admin.site.register(Voter)

qa/admin.py

@@ -0,0 +1,35 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('qa', '0013_auto_20150210_1002'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Voter',
+            fields=[
+                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+                ('answer', models.ForeignKey(to='qa.Answer')),
+                ('user', models.ForeignKey(to='qa.UserProfile')),
+            ],
+            options={
+            },
+            bases=(models.Model,),
+        ),
+        migrations.RemoveField(
+            model_name='answer',
+            name='votes',
+        ),
+        migrations.AlterField(
+            model_name='userprofile',
+            name='picture',
+            field=models.ImageField(upload_to=b'profile_images', blank=True),
+            preserve_default=True,
+        ),
+    ]

qa/migrations/0014_auto_20150212_0636.py

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('qa', '0014_auto_20150212_0636'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='answer',
+            name='votes',
+            field=models.IntegerField(default=0),
+            preserve_default=True,
+        ),
+    ]

qa/migrations/0015_answer_votes.py

@@ -44,6 +44,10 @@ class Answer(models.Model):
     def __str__(self):
         return self.answer_text
 
+class Voter(models.Model):
+    user = models.ForeignKey(UserProfile)
+    answer = models.ForeignKey(Answer)
+
 class Comment(models.Model):
     answer = models.ForeignKey(Answer)
     comment_text = models.CharField(max_length=200)

qa/models.py

@@ -1,7 +1,19 @@
 {% load bootstrap3 %}
 
 {% bootstrap_css %}
+<script src="//ajax.googleapis.com/ajax/libs/jquery/2.0.3/jquery.min.js"></script>
 {% bootstrap_javascript %}
+<script>
+$(function () {
+  $('[data-toggle="tooltip"]').tooltip()
+})
+</script>
+<style>
+big {
+  font-size:20px;
+  padding : 2px 0px 2px 0px;
+}
+</style>
 {% load staticfiles %}
 {% load django_markdown %}
 
@@ -18,6 +30,14 @@
   <h1><a href="/">Simple QA </a><small>Open Questions</small></h1>
 </div>
 
+{% if message %}
+<div class="alert alert-danger" role="alert">{{ message }}
+  <button type="button" class="close" data-dismiss="alert" aria-label="Close">
+  <span aria-hidden="true">&times;</span>
+</button>
+</div>
+{% endif %}
+
 <div class="jumbotron">
   <p class="pull-right">{{ question.pub_date }}</p>
   <h3><cool>Q: </cool>{{ question.question_text }}</h3>
@@ -33,7 +53,12 @@ <h3 class="panel-title">Answers</h3>
     {% for answer in answers %}
     <div class="row">
       {% if user.is_authenticated %}
-      <div class ="col-md-1"><h3><a href="/vote/{{ answer.id }}/{{ question.id }}/0/"><span class="glyphicon glyphicon-plus" aria-hidden="true"></span></a> {{ answer.votes }} <a href="/vote/{{ answer.id }}/{{ question.id }}/1/"><span class="glyphicon glyphicon-minus" aria-hidden="true"></span></a></h3></div>
+      <div class ="col-md-1">
+        <div class="row">
+          <div class ="col-sm-1"><big class="pull-left"><b>{{ answer.votes }}</b></big></div>
+          <div class ="col-sm-1"><a class="btn btn-sm btn-success" data-toggle="tooltip" data-placement="top" title="Vote Up this answer" href="/vote/{{ user.id }}/{{ answer.id }}/{{ question.id }}/0/"><span class="glyphicon glyphicon-plus" aria-hidden="true"></span></a> <a class="btn btn-sm btn-danger" data-toggle="tooltip" data-placement="bottom" title="Vote Down this answer" href="/vote/{{ user.id }}/{{ answer.id }}/{{ question.id }}/1/"><span class="glyphicon glyphicon-minus" aria-hidden="true"></span></a></div>
+        </div>
+      </div>
       {% endif %}
       <div class ="col-md-9">
         <a href="/comment/{{ answer.id }}/" class="pull-right"><small><span class="glyphicon glyphicon-comment" aria-hidden="true"></span> Comment &nbsp;</small></a>

qa/templates/qa/detail.html

@@ -182,8 +182,37 @@ def add_answer(request):
 
     return render(request, 'qa/detail.html', {'question': question})
 
-def vote(request, answer_id, question_id, op_code):
+def vote(request, user_id, answer_id, question_id, op_code):
+
+    user_ob = User.objects.get(id=user_id)
+    user = UserProfile.objects.get(user=user_ob)
     answer = Answer.objects.get(pk=answer_id)
+    question = Question.objects.get(pk=question_id)
+
+    answer_list = question.answer_set.order_by('-votes')
+
+    paginator = Paginator(answer_list, 10)
+    page = request.GET.get('page')
+    try:
+        answers = paginator.page(page)
+    except PageNotAnInteger:
+        # If page is not an integer, deliver first page.
+        answers = paginator.page(1)
+    except EmptyPage:
+        # If page is out of range (e.g. 9999), deliver last page of results.
+        answers = paginator.page(paginator.num_pages)
+
+    if Answer.objects.filter(id=answer_id, user_data=user).exists():
+        return render(request, 'qa/detail.html', {'question': question, 'answers': answers, 'message':"You cannot vote on your answer!"})
+
+    if Voter.objects.filter(answer_id=answer_id, user=user).exists():
+        return render(request, 'qa/detail.html', {'question': question, 'answers': answers, 'message':"You've already cast vote on this answer!"})
+
+    v = Voter()
+    v.user = user
+    v.answer = answer
+    v.save()
+
     if op_code == '0':
         answer.votes += 1
         u = answer.user_data
@@ -196,8 +225,6 @@ def vote(request, answer_id, question_id, op_code):
         u.save()
     answer.save()
 
-    question = Question.objects.get(pk=question_id)
-
     answer_list = question.answer_set.order_by('-votes')
 
     paginator = Paginator(answer_list, 10)

qa/views.py

@@ -11,7 +11,7 @@
     url(r'^admin/', include(admin.site.urls)),
     url(r'^add/$', views.add, name='add'),
     url(r'^answer/$', views.add_answer, name='add_answer'),
-    url(r'^vote/(?P<answer_id>\d+)/(?P<question_id>\d+)/(?P<op_code>\d+)/$', views.vote, name='vote'),
+    url(r'^vote/(?P<user_id>\d+)/(?P<answer_id>\d+)/(?P<question_id>\d+)/(?P<op_code>\d+)/$', views.vote, name='vote'),
     url(r'^comment/(?P<answer_id>\d+)/$', views.comment, name='comment'),
     url(r'^search/$', views.search, name='search'),