# HG changeset patch
# User Brian Neal <bgneal@gmail.com>
# Date 1306010102 0
# Node ID ac9217eef6104c4a605372d123e495017dcda2f3
# Parent  1f139de929c4a12c4eaabfbf9497a3d7e0dc27c9
Added total vote information to the poll templates. Cache the total votes in the model instance.

diff -r 1f139de929c4 -r ac9217eef610 gpp/polls/models.py
--- a/gpp/polls/models.py	Sat May 21 19:55:48 2011 +0000
+++ b/gpp/polls/models.py	Sat May 21 20:35:02 2011 +0000
@@ -68,12 +68,16 @@
 
         return (total_votes, choices)
 
-    def total_votes(self):
+    def _total_votes(self):
         """
         Returns the number of votes cast in this poll to date.
 
         """
-        return sum(choice.votes for choice in self.choice_set.all())
+        if not hasattr(self, '_total_votes_cache'):
+            self._total_votes_cache = sum(choice.votes for choice in
+                                            self.choice_set.all())
+        return self._total_votes_cache
+    total_votes = property(_total_votes)
 
     def is_open(self):
         now = datetime.datetime.now()
diff -r 1f139de929c4 -r ac9217eef610 gpp/templates/polls/index.html
--- a/gpp/templates/polls/index.html	Sat May 21 19:55:48 2011 +0000
+++ b/gpp/templates/polls/index.html	Sat May 21 20:35:02 2011 +0000
@@ -8,6 +8,7 @@
    <ul>
    {% for poll in current_polls %}
       <li><a href="{{ poll.get_absolute_url }}">{{ poll.question }}</a> &bull; 
+      {{ poll.total_votes }} vote{{ poll.total_votes|pluralize }} &bull;
       {% get_comment_count for poll as comment_count %}
       {{ comment_count }} comment{{ comment_count|pluralize }} &bull;
       {{ poll.start_date|date:"M d, Y" }}
@@ -25,6 +26,7 @@
    <ul>
    {% for poll in old_polls %}
       <li><a href="{{ poll.get_absolute_url }}">{{ poll.question }}</a> &bull; 
+      {{ poll.total_votes }} vote{{ poll.total_votes|pluralize }} &bull;
       {% get_comment_count for poll as comment_count %}
       {{ comment_count }} comment{{ comment_count|pluralize }} &bull;
       {{ poll.start_date|date:"M d, Y" }} -
diff -r 1f139de929c4 -r ac9217eef610 gpp/templates/polls/poll.html
--- a/gpp/templates/polls/poll.html	Sat May 21 19:55:48 2011 +0000
+++ b/gpp/templates/polls/poll.html	Sat May 21 20:35:02 2011 +0000
@@ -15,7 +15,8 @@
 {% endif %}
 {% get_comment_count for poll as comment_count %}
 <p>
-This poll has <a href="{% url 'polls.views.poll_results' poll.id %}">{{ comment_count }} comment{{ comment_count|pluralize }}</a>.
+This poll has {{ poll.total_votes }} vote{{ poll.total_votes|pluralize }} and 
+<a href="{% url 'polls.views.poll_results' poll.id %}">{{ comment_count }} comment{{ comment_count|pluralize }}</a>.
 {% if poll.is_open %}
 Voting for this poll started on {{ poll.start_date|date:"F d, Y" }}. 
    {% if poll.end_date %}