change the order in which comments are ordered

[osqa.git] / forum / templatetags / node_tags.py

diff --git a/forum/templatetags/node_tags.py b/forum/templatetags/node_tags.py
index 4eebaf7fadba8064ffde7a60d46faac4934f3cc7..6fc19cec56dd036d2740a4d60d4d83ca2fdd0f95 100644 (file)
--- a/forum/templatetags/node_tags.py
+++ b/forum/templatetags/node_tags.py
@@ -7,6 +7,7 @@ from django.utils.translation import ungettext, ugettext as _
 from django.utils.html import strip_tags\r
 from django.utils.encoding import smart_unicode\r
 from django.utils.safestring import mark_safe\r
+from django.conf import settings as django_settings\r
 from django.core.urlresolvers import reverse\r
 from django import template\r
 from forum.actions import *\r
@@ -81,7 +82,13 @@ def post_control(text, url, command=False, withprompt=False, confirm=False, titl
         (copy and " copy" or " ")\r
     return {'text': text, 'url': url, 'classes': classes, 'title': title}\r
 \r
-@register.inclusion_tag('node/post_controls.html')\r
+\r
+moderation_enabled = False\r
+for m in django_settings.MODULE_LIST:\r
+    if m.__name__.endswith('moderation'):\r
+        moderation_enabled = True\r
+\r
+@register.inclusion_tag('node/post_controls.html' if not moderation_enabled else "modules/moderation/node/post_controls.html")\r
 def post_controls(post, user):\r
     controls = []\r
     menu = []\r
@@ -175,7 +182,7 @@ def post_controls(post, user):
 \r
 @register.inclusion_tag('node/comments.html')\r
 def comments(post, user):\r
-    all_comments = post.comments.filter_state(deleted=False).order_by('added_at')\r
+    all_comments = post.comments.filter_state(deleted=False).order_by('-added_at')\r
 \r
     if len(all_comments) <= 5:\r
         top_scorers = all_comments\r