X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/50d5fd554fe0f2633459ba3e8e57674869ba1643..cf523df2eb6e7b696c693e68b449a2c541bbaa67:/forum/models/node.py

diff --git a/forum/models/node.py b/forum/models/node.py
index bf82708..6d51793 100644
--- a/forum/models/node.py
+++ b/forum/models/node.py
@@ -29,7 +29,7 @@ class NodeContent(models.Model):
         return auto_user_link(self, self._as_markdown(content, *['auto_linker']))
 
     @classmethod
-    def _as_markdown(cls, content, *extensions):
+    def _as_markdown_raw(cls, content, *extensions):
         try:
             return mark_safe(sanitize_html(markdown.markdown(content, extensions=extensions)))
         except Exception, e:
@@ -38,6 +38,11 @@ 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)
 
@@ -52,7 +57,7 @@ class NodeContent(models.Model):
 
     def tagname_list(self):
         if self.tagnames:
-            return [name.strip() for name in self.tagnames.split(u' ') if name]
+            return [name.strip() for name in self.tagnames.split() if name]
         else:
             return []
 
@@ -359,7 +364,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()
 
@@ -375,6 +395,18 @@ class Node(BaseModel, NodeContent):
 
         return active_users
 
+    def get_last_edited(self):
+        if not self.last_edited:
+            try:
+                le = self.actions.exclude(action_type__in=('voteup', 'votedown', 'flag'), canceled=True).order_by('-action_date')[0]
+                self.last_edited = le
+                self.save()
+            except:
+                pass
+
+        return self.last_edited
+
+
     def _list_changes_in_tags(self):
         dirty = self.get_dirty_fields()
 
@@ -468,7 +500,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'