Changeset 188:19a8aff81d32

Timestamp:

Nov 29, 2009 5:41:26 PM (3 years ago)

Author:

slav0nic <slav0nic0@…>

Branch:

default

Message:

fixed #54: Default reputation must be 0

Location:

djangobb/apps/forum

Files:

• models.py (modified) (2 diffs)
• templates/forum/topic.html (modified) (1 diff)
• views.py (modified) (1 diff)

djangobb/apps/forum/models.py

@@ -2 +2 @@
 import os
 import os.path
-
+from markdown import Markdown
 
 from django.db import models
@@ -11 +11 @@
 from django.utils.translation import ugettext_lazy as _
 from django.utils.hashcompat import sha_constructor
-#from django.contrib.markup.templatetags.markup import markdown
-from markdown import Markdown
 
 from forum.markups import mypostmarkup 

djangobb/apps/forum/templates/forum/topic.html

@@ -56 +56 @@
                                                 {% if "REPUTATION_SUPPORT"|forum_setting %}
                                                         {% ifnotequal request.user post.user.username %}
-                                                                <dd><a href="{% url reputation post.user %}">{% trans "Reputation" %}</a> :  <a href="{% url reputation post.user %}?action=plus&topic_id={{ post.topic.id }}"><img src="{{ MEDIA_URL }}forum/img/reputation/warn_add.gif" alt="+" border="0"></a>&nbsp;&nbsp;<strong>{{ post.user.forum_profile.reply_total }}&nbsp;&nbsp;</strong><a href="{% url reputation post.user %}?action=minus&topic_id={{ post.topic.id }}"><img src="{{ MEDIA_URL }}forum/img/reputation/warn_minus.gif" alt="-" border="0"></a></dd>
+                                                                <dd><a href="{% url reputation post.user %}">{% trans "Reputation" %}</a> : <a href="{% url reputation post.user %}?action=plus&topic_id={{ post.topic.id }}"><img src="{{ MEDIA_URL }}forum/img/reputation/warn_add.gif" alt="+" border="0"></a>&nbsp;&nbsp;<strong>{{ post.user.forum_profile.reply_total }}&nbsp;&nbsp;</strong><a href="{% url reputation post.user %}?action=minus&topic_id={{ post.topic.id }}"><img src="{{ MEDIA_URL }}forum/img/reputation/warn_minus.gif" alt="-" border="0"></a></dd>
                                                         {% endifnotequal %}
                                                 {% endif %}
                                                 <dd class="usercontacts"><a href="{% url forum_profile post.user %}">{% trans "Profile" %}</a>&nbsp;&nbsp;
                                                 {% ifequal post.user.forum_profile.privacy_permission 0 %}
-                                                                <a href="mailto:{{ post.user.email }}">{% trans "E-mail" %}</a>&nbsp;&nbsp;
-                                                        {% else %}
-                                                                {% ifequal post.user.forum_profile.privacy_permission 1 %}
+                                                        <a href="mailto:{{ post.user.email }}">{% trans "E-mail" %}</a>&nbsp;&nbsp;
+                                                {% else %}
+                                                        {% ifequal post.user.forum_profile.privacy_permission 1 %}
                                                                         <a href="{% url misc %}?mail_to={{ post.user }}">{% trans "Send e-mail" %}</a>&nbsp;&nbsp;
-                                                                {% endifequal %}
+                                                        {% endifequal %}
                                                 {% endifequal %}
                                                 {% if "PM_SUPPORT"|forum_setting %}

djangobb/apps/forum/views.py

@@ -292 +292 @@
         replies_list = Reputation.objects.filter(to_user__pk__in=users).values('to_user_id').annotate(sign=Sum('sign')) #values_list buggy?
 
-        if replies_list:
-            replies = {}
-            for r in replies_list:
-                replies[r['to_user_id']] = r['sign']
-
-            for post in posts:
-                post.user.forum_profile.reply_total = replies.get(post.user.id, 0)
+        replies = {}
+        for r in replies_list:
+            replies[r['to_user_id']] = r['sign']
+
+        for post in posts:
+            post.user.forum_profile.reply_total = replies.get(post.user.id, 0)
 
     initial = {}