X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/d41b8890afb195ad1accaea79fe2323d65b98c59..981f2713a5caa510f596a089f78579f5ed317bd5:/forum/models/node.py

diff --git a/forum/models/node.py b/forum/models/node.py
index 286bf4a..e8d6334 100644
--- a/forum/models/node.py
+++ b/forum/models/node.py
@@ -1,8 +1,12 @@
+# -*- coding: utf-8 -*-
+
 from base import *
+import logging
 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 +43,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 +246,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,16 +318,27 @@ 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
 
+    # Can be used to block subscription notifications for a specific node from a module
+    def _is_notifiable(self):
+        return True
+
+    @property
+    def is_notifiable(self):
+        return self._is_notifiable()
+
     @models.permalink
     def get_revisions_url(self):
         return ('revisions', (), {'id': self.id})
@@ -359,7 +374,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()
 
@@ -420,15 +450,13 @@ class Node(BaseModel, NodeContent):
 
                 if not self.nis.deleted:
                     tag.add_to_usage_count(1)
-                    tag.save()
 
             if not self.nis.deleted:
                 for name in tag_changes['removed']:
                     try:
                         tag = Tag.objects.get(name=name)
                         tag.add_to_usage_count(-1)
-                        tag.save()
-                    except:
+                    except Tag.DoesNotExist:
                         pass
 
             return True
@@ -442,16 +470,13 @@ class Node(BaseModel, NodeContent):
         if action:
             for tag in self.tags.all():
                 tag.add_to_usage_count(-1)
-                tag.save()
         else:
             for tag in Tag.objects.filter(name__in=self.tagname_list()):
                 tag.add_to_usage_count(1)
-                tag.save()
 
     def delete(self, *args, **kwargs):
         for tag in self.tags.all():
             tag.add_to_usage_count(-1)
-            tag.save()
 
         self.active_revision = None
         self.save()
@@ -480,7 +505,10 @@ class Node(BaseModel, NodeContent):
         
         super(Node, self).save(*args, **kwargs)
         if tags_changed:
-            self.tags = list(Tag.objects.filter(name__in=self.tagname_list()))
+            if self.tagnames.strip():
+                self.tags = list(Tag.objects.filter(name__in=self.tagname_list()))
+            else:
+                self.tags = []
 
     class Meta:
         app_label = 'forum'