add a new after_head_js block (immediately after the <head> tag), allows to add track...

[osqa.git] / forum / models / node.py
diff --git a/forum/models/node.py b/forum/models/node.py

index 96b41dcd054af541519873fdb0925562390a6d7b..cc17941df91f1987591b68b710110bb0ccacbe27 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):
@@ -359,7 +362,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()