X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/a3789a5369fa797fb765b3234a4ad796accd28e4..9bee23ed8d6c06f5f000f8951d8cb37953d214d1:/forum/models/node.py diff --git a/forum/models/node.py b/forum/models/node.py index 96b41dc..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) @@ -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()