OSQA-809, Include question summaries in question and answers views, wrap that in...

[osqa.git] / forum / models / node.py

diff --git a/forum/models/node.py b/forum/models/node.py
index 96b41dcd054af541519873fdb0925562390a6d7b..83b9ab72b3096d9ca867b8dbe168b538b0bdb006 100644 (file)
--- a/forum/models/node.py
+++ b/forum/models/node.py
@@ -1,8 +1,11 @@
+# -*- coding: utf-8 -*-
+
 from base import *
 import re
 from tag import Tag
 
 import markdown
+from django.utils.encoding import smart_unicode
 from django.utils.translation import ugettext as _
 from django.utils.safestring import mark_safe
 from django.utils.html import strip_tags
@@ -39,7 +42,7 @@ class NodeContent(models.Model):
             return ''
 
     def as_markdown(self, *extensions):
-        return self._as_markdown(self.body, *extensions)
+        return self._as_markdown(smart_unicode(self.body), *extensions)
 
     @property
     def headline(self):
@@ -242,7 +245,7 @@ class Node(BaseModel, NodeContent):
     marked = models.BooleanField(default=False)
 
     comment_count = DenormalizedField("children", node_type="comment", canceled=False)
-    flag_count = DenormalizedField("flags")
+    flag_count = DenormalizedField("actions", action_type="flag", canceled=False)
 
     friendly_name = _("post")
 
@@ -314,13 +317,16 @@ class Node(BaseModel, NodeContent):
 
     @property
     def summary(self):
-        content = strip_tags(self.html)[:SUMMARY_LENGTH]
+        content = strip_tags(self.html)
 
         # Remove multiple spaces.
         content = re.sub(' +',' ', content)
 
-        # Remove line breaks. We don't need them at all.
-        content = content.replace("\n", '')
+        # Replace line breaks with a space, we don't need them at all.
+        content = content.replace("\n", ' ')
+
+        # Truncate and all an ellipsis if length greater than summary length.
+        content = (content[:SUMMARY_LENGTH] + '...') if len(content) > SUMMARY_LENGTH else content
 
         return content
 
@@ -359,7 +365,22 @@ class Node(BaseModel, NodeContent):
         self.body = self.rendered(revision.body)
 
         self.active_revision = revision
-        self.update_last_activity(user)
+
+        # Try getting the previous revision
+        try:
+            prev_revision = NodeRevision.objects.get(node=self, revision=revision.revision-1)
+
+            update_activity = True
+
+            # Do not update the activity if only the tags are changed
+            if prev_revision.title == revision.title and prev_revision.body == revision.body \
+            and prev_revision.tagnames != revision.tagnames and not settings.UPDATE_LATEST_ACTIVITY_ON_TAG_EDIT:
+                update_activity = False
+        except NodeRevision.DoesNotExist:
+            update_activity = True
+        finally:
+            if update_activity:
+                self.update_last_activity(user)
 
         self.save()