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 6d51793517b4db408c835145a31ce53028962b97..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
@@ -29,7 +32,7 @@ class NodeContent(models.Model):
         return auto_user_link(self, self._as_markdown(content, *['auto_linker']))
 
     @classmethod
-    def _as_markdown_raw(cls, content, *extensions):
+    def _as_markdown(cls, content, *extensions):
         try:
             return mark_safe(sanitize_html(markdown.markdown(content, extensions=extensions)))
         except Exception, e:
@@ -38,13 +41,8 @@ class NodeContent(models.Model):
                 str(e), cls.__name__, str(e), traceback.format_exc()))
             return ''
 
-    # Replace \ with \\ to preserve backslashes during markdown processing
-    @classmethod
-    def _as_markdown(cls, content, *extensions):
-       return cls._as_markdown_raw(content.replace('\\','\\\\'), *extensions)
-
     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):
@@ -247,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")
 
@@ -319,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