Adding method that checks if the user has the ability (permission) to convert commen...

[osqa.git] / forum / models / node.py

diff --git a/forum/models/node.py b/forum/models/node.py
index 69c6396a4bc2cd9e26c5e86360172c3b41c13c76..6a181659956e735158ccffd257c799841668852e 100644 (file)
--- a/forum/models/node.py
+++ b/forum/models/node.py
@@ -21,7 +21,7 @@ class NodeContent(models.Model):
 
     @property
     def html(self):
-        return self.as_markdown()
+        return self.body
 
     @classmethod
     def _as_markdown(cls, content, *extensions):
@@ -334,10 +334,10 @@ class Node(BaseModel, NodeContent):
         self.activate_revision(user, revision)
         return revision
 
-    def activate_revision(self, user, revision):
+    def activate_revision(self, user, revision, *extensions):
         self.title = revision.title
         self.tagnames = revision.tagnames
-        self.body = revision.body
+        self.body = self._as_markdown(revision.body, *extensions)
 
         self.active_revision = revision
         self.update_last_activity(user)
@@ -425,6 +425,7 @@ class Node(BaseModel, NodeContent):
             super(BaseModel, self).save(*args, **kwargs)
             self.active_revision = self._create_revision(self.author, 1, title=self.title, tagnames=self.tagnames,
                                                          body=self.body)
+            self.activate_revision(self.author, self.active_revision)
             self.update_last_activity(self.author, time=self.added_at)
 
         if self.parent_id and not self.abs_parent_id: