Merge branch 'hotfix-1.2.1b4'

Author: bbengfort

README.md

@@ -107,13 +107,21 @@ The release versions that are sent to the Python package index (PyPI) are also t
 
 The versioning uses a three part version system, "a.b.c" - "a" represents a major release that may not be backwards compatible. "b" is incremented on minor releases that may contain extra features, but are backwards compatible. "c" releases are bug fixes or other micro changes that developers should feel free to immediately update to.
 
-### Version 1.2 Beta 3
+### Hotfix 1.2.1 Beta 4
 
-* **tag**: [v1.1b2](https://github.com/DistrictDataLabs/minimum-entropy/releases/tag/v1.2b3)
+* **tag**: [v1.2.1b4](https://github.com/DistrictDataLabs/minimum-entropy/releases/tag/v1.2.1b4)
 * **deployment**: Monday, July 11, 2016
 * **commit**: [see tag](#)
 
-The third beta fixes the tag grid system which got all wonky in the first implementation when actual data was put in. The new style is similar to the Stack Overflow tag grid style. Moreover, now tags are case insensitive, which should help eliminate duplicates. The activity stream was also updated to use templates for a bit more robust control. The "answered" activity now takes the answer as a target rather than as a theme, and answers have detail links to the question that they're on. 
+A quick hotfix due to a question and answer ordering by vote bug. Also took the chance to add links to the tags in the question list and detail pages as well as to fix the synonym bug (temporarily). Links for the tags are still not rendered after JavaScript editing though.
+
+### Version 1.2 Beta 3
+
+* **tag**: [v1.2b3](https://github.com/DistrictDataLabs/minimum-entropy/releases/tag/v1.2b3)
+* **deployment**: Monday, July 11, 2016
+* **commit**: [6ff3530](https://github.com/DistrictDataLabs/minimum-entropy/commit/6ff3530eaf6af0584e65577ddeeedc19aced84a5)
+
+The third beta fixes the tag grid system which got all wonky in the first implementation when actual data was put in. The new style is similar to the Stack Overflow tag grid style. Moreover, now tags are case insensitive, which should help eliminate duplicates. The activity stream was also updated to use templates for a bit more robust control. The "answered" activity now takes the answer as a target rather than as a theme, and answers have detail links to the question that they're on.
 
 ### Version 1.1 Beta 2
 

docs/about.md

@@ -49,13 +49,21 @@ The release versions that are sent to the Python package index (PyPI) are also t
 
 The versioning uses a three part version system, "a.b.c" - "a" represents a major release that may not be backwards compatible. "b" is incremented on minor releases that may contain extra features, but are backwards compatible. "c" releases are bug fixes or other micro changes that developers should feel free to immediately update to.
 
-### Version 1.2 Beta 3
+### Hotfix 1.2.1 Beta 4
 
-* **tag**: [v1.1b2](https://github.com/DistrictDataLabs/minimum-entropy/releases/tag/v1.2b3)
+* **tag**: [v1.2.1b4](https://github.com/DistrictDataLabs/minimum-entropy/releases/tag/v1.2.1b4)
 * **deployment**: Monday, July 11, 2016
 * **commit**: [see tag](#)
 
-The third beta fixes the tag grid system which got all wonky in the first implementation when actual data was put in. The new style is similar to the Stack Overflow tag grid style. Moreover, now tags are case insensitive, which should help eliminate duplicates. The activity stream was also updated to use templates for a bit more robust control. The "answered" activity now takes the answer as a target rather than as a theme, and answers have detail links to the question that they're on. 
+A quick hotfix due to a question and answer ordering by vote bug. Also took the chance to add links to the tags in the question list and detail pages as well as to fix the synonym bug (temporarily). Links for the tags are still not rendered after JavaScript editing though.
+
+### Version 1.2 Beta 3
+
+* **tag**: [v1.2b3](https://github.com/DistrictDataLabs/minimum-entropy/releases/tag/v1.2b3)
+* **deployment**: Monday, July 11, 2016
+* **commit**: [6ff3530](https://github.com/DistrictDataLabs/minimum-entropy/commit/6ff3530eaf6af0584e65577ddeeedc19aced84a5)
+
+The third beta fixes the tag grid system which got all wonky in the first implementation when actual data was put in. The new style is similar to the Stack Overflow tag grid style. Moreover, now tags are case insensitive, which should help eliminate duplicates. The activity stream was also updated to use templates for a bit more robust control. The "answered" activity now takes the answer as a target rather than as a theme, and answers have detail links to the question that they're on.
 
 ### Version 1.1 Beta 2
 

fugato/managers.py

@@ -19,10 +19,10 @@
 
 from django.db import models
 from minent.utils import signature, normalize_query
-
+from django.db.models.functions import Coalesce
 
 ##########################################################################
-## Tag QuerySet
+## Question QuerySet
 ##########################################################################
 
 class QuestionQuerySet(models.query.QuerySet):
@@ -40,7 +40,7 @@ def count_votes(self):
         """
         Returns questions annotated with the number of votes they have.
         """
-        return self.annotate(num_votes=models.Count('votes'))
+        return self.annotate(num_votes=Coalesce(models.Sum('votes__vote'), 0))
 
     def count_answers(self):
         """
@@ -115,3 +115,39 @@ def get_queryset(self):
         Return a QuestionQuerySet instead of the standard queryset.
         """
         return QuestionQuerySet(self.model, using=self._db)
+
+
+##########################################################################
+## Answer QuerySet
+##########################################################################
+
+class AnswerQuerySet(models.query.QuerySet):
+    """
+    Adds special methods to a query set of question objects.
+    """
+
+    def count_votes(self):
+        """
+        Returns questions annotated with the number of votes they have.
+        """
+        return self.annotate(num_votes=Coalesce(models.Sum('votes__vote'), 0))
+
+
+##########################################################################
+## Answer Manager
+##########################################################################
+
+class AnswerManager(models.Manager):
+
+    def count_votes(self):
+        """
+        Returns questions annotated with the number of votes they have.
+        """
+        return self.get_queryset().count_votes()
+
+
+    def get_queryset(self):
+        """
+        Return a QuestionQuerySet instead of the standard queryset.
+        """
+        return AnswerQuerySet(self.model, using=self._db)

fugato/models.py

@@ -19,16 +19,17 @@
 
 import time
 
+from slugify import slugify
 from django.db import models
 from voting.models import Vote
+from operator import itemgetter
 from minent.utils import nullable
 from autoslug import AutoSlugField
-from fugato.managers import QuestionManager
-from model_utils.models import TimeStampedModel
 from django.core.urlresolvers import reverse
+from model_utils.models import TimeStampedModel
+from fugato.managers import QuestionManager, AnswerManager
 from django.contrib.contenttypes.fields import GenericRelation
-from slugify import slugify
-from operator import itemgetter
+
 
 ##########################################################################
 ## Qustion and Answer Models
@@ -49,6 +50,10 @@ class Question(TimeStampedModel):
     ## Set custom manager on Question
     objects  = QuestionManager()
 
+    class Meta:
+        db_table = "questions"
+        get_latest_by = 'created'
+
     def get_absolute_url(self):
         """
         Return the detail view of the Question object
@@ -79,20 +84,14 @@ def set_answer_order_by_votes(self):
         passes in the order based on the sum of the votes.
         """
         # Construct the aggregation query
-        query = self.answers.values('id')
-        query = query.annotate(votes=models.Sum('votes__vote'))
+        query = self.answers.count_votes().values('id', 'num_votes')
 
         order = [
-            a['id'] for a in sorted(query, key=itemgetter('votes'), reverse=True)
+            a['id'] for a in sorted(query, key=itemgetter('num_votes'), reverse=True)
         ]
 
         self.set_answer_order(order)
 
-
-    class Meta:
-        db_table = "questions"
-        get_latest_by = 'created'
-
     def __str__(self):
         return self.text
 
@@ -109,6 +108,9 @@ class Answer(TimeStampedModel):
     question = models.ForeignKey( 'fugato.Question', related_name="answers" )    # The question this answer answers
     votes    = GenericRelation( Vote, related_query_name='answers' )             # Votes for the goodness of the answer
 
+    ## Set custom manager on Answer
+    objects  = AnswerManager()
+
     class Meta:
         db_table = "answers"
         order_with_respect_to = 'question'

minent/templates/fugato/list.html

@@ -82,7 +82,9 @@ <h3>
                   <span class="label label-info">{{ question.answers.count }} answer{{ question.answers.count|pluralize }}</span>
                   <span class="label label-info">{{ question.votes.count }} vote{{ question.votes.count|pluralize }}</span>
                   {% for tag in question.tags.all %}
-                  <span class="label label-primary">{% if tag.is_synonym %}{{ tag.head_word }}{% else %}{{ tag }}{% endif %}</span>
+                  <a href="{% url 'question-list' %}?tag={{ tag.slug }}" title="Show questions tagged: {{ tag.text }}">
+                    <span class="label label-primary">{{ tag }}</span>
+                  </a>
                   {% endfor %}
                 </p>
               </div>

minent/templates/fugato/question.html

@@ -129,7 +129,9 @@ <h2 id="questionText">{{ question.text }}</h2>
             <div class="question-tagging">
               <div class="pull-left" id="questionTags">
                 {% for tag in question.tags.all %}
-                <span class="label label-primary">{% if tag.is_synonym %}{{ tag.head_word }}{% else %}{{ tag }}{% endif %}</span>
+                <a href="{% url 'question-list' %}?tag={{ tag.slug }}" title="Show questions tagged: {{ tag.text }}">
+                  <span class="label label-primary">{{ tag }}</span>
+                </a>
                 {% endfor %}
               </div>
               <div class="pull-right">

minent/tests/test_init.py

@@ -23,7 +23,7 @@
 ## Module variables
 ##########################################################################
 
-EXPECTED_VERSION = "1.2b3"
+EXPECTED_VERSION = "1.2.1b4"
 
 ##########################################################################
 ## Initialization Tests

minent/version.py

@@ -20,9 +20,9 @@
 __version_info__ = {
     'major': 1,
     'minor': 2,
-    'micro': 0,
+    'micro': 1,
     'releaselevel': 'beta',
-    'serial': 3,
+    'serial': 4,
 }
 
 

stream/templatetags/__init__.py

@@ -7,7 +7,7 @@
 # Copyright (C) 2016 District Data Labs
 # For license information, see LICENSE.txt
 #
-# ID: __init__.py [] [email protected] $
+# ID: __init__.py [001baf8] [email protected] $
 
 """
 Custom inclusion tags for stream activity objects.

stream/templatetags/activity.py

@@ -7,7 +7,7 @@
 # Copyright (C) 2016 District Data Labs
 # For license information, see LICENSE.txt
 #
-# ID: activity.py [] [email protected] $
+# ID: activity.py [001baf8] [email protected] $
 
 """
 Representations of activity stream objects.