convertd comments to nodes

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

diff --git a/forum/models/node.py b/forum/models/node.py
index 932452d9c064ceae0a7235434b24c193843edb53..530981beee4087d131de6d63255ae6724b1f1d34 100644 (file)
--- a/forum/models/node.py
+++ b/forum/models/node.py
@@ -12,6 +12,10 @@ class NodeContent(models.Model):
     author     = models.ForeignKey(User, related_name='%(class)ss')\r
     body       = models.TextField()\r
 \r
     author     = models.ForeignKey(User, related_name='%(class)ss')\r
     body       = models.TextField()\r
 \r

+    @property\r
+    def user(self):\r
+        return self.author\r
+\r

     @property\r
     def html(self):\r
         return mark_safe(sanitize_html(markdown.markdown(self.body)))\r
     @property\r
     def html(self):\r
         return mark_safe(sanitize_html(markdown.markdown(self.body)))\r


@@ -20,10 +24,6 @@ class NodeContent(models.Model):
     def headline(self):\r
         return self.title\r
 \r
     def headline(self):\r
         return self.title\r
 \r

-    @property\r
-    def summary(self):\r
-        return strip_tags(self.html)[:300]\r
-\r

     def tagname_list(self):\r
         if self.tagnames:\r
             return [name for name in self.tagnames.split(u' ')]\r
     def tagname_list(self):\r
         if self.tagnames:\r
             return [name for name in self.tagnames.split(u' ')]\r


@@ -58,17 +58,17 @@ class NodeMetaClass(models.Model.__metaclass__):
         name = node_cls.__name__.lower()\r
 \r
         def children(self):\r
         name = node_cls.__name__.lower()\r
 \r
         def children(self):\r

-            return node_cls.objects.filter(parent=self)\r
+            if node_cls._meta.proxy:\r
+                return node_cls.objects.filter(node_type=name, parent=self)\r
+            else:\r
+                return node_cls.objects.filter(parent=self)\r

 \r
         def parent(self):\r
             p = self.__dict__.get('_%s_cache' % name, None)\r
 \r
 \r
         def parent(self):\r
             p = self.__dict__.get('_%s_cache' % name, None)\r
 \r

-            if p is None:\r
-                try:\r
-                    p = self.parent.leaf\r
-                    self.__dict__['_%s_cache' % name] = p\r
-                except Exception, e:\r
-                    pass\r
+            if p is None and (self.parent is not None) and self.parent.node_type == name:\r
+                p = self.parent.leaf\r
+                self.__dict__['_%s_cache' % name] = p\r

 \r
             return p\r
 \r
 \r
             return p\r
 \r


@@ -76,6 +76,8 @@ class NodeMetaClass(models.Model.__metaclass__):
         Node.add_to_class(name, property(parent))\r
 \r
 \r
         Node.add_to_class(name, property(parent))\r
 \r
 \r

+node_create = django.dispatch.Signal(providing_args=['instance'])\r
+\r

 class Node(BaseModel, NodeContent, DeletableContent):\r
     __metaclass__ = NodeMetaClass\r
 \r
 class Node(BaseModel, NodeContent, DeletableContent):\r
     __metaclass__ = NodeMetaClass\r
 \r


@@ -90,7 +92,7 @@ class Node(BaseModel, NodeContent, DeletableContent):
     vote_up_count         = models.IntegerField(default=0)\r
     vote_down_count       = models.IntegerField(default=0)\r
 \r
     vote_up_count         = models.IntegerField(default=0)\r
     vote_down_count       = models.IntegerField(default=0)\r
 \r

-    comment_count        = models.PositiveIntegerField(default=0)\r
+    comment_count         = models.PositiveIntegerField(default=0)\r

     offensive_flag_count  = models.SmallIntegerField(default=0)\r
 \r
     last_edited_at        = models.DateTimeField(null=True, blank=True)\r
     offensive_flag_count  = models.SmallIntegerField(default=0)\r
 \r
     last_edited_at        = models.DateTimeField(null=True, blank=True)\r


@@ -102,6 +104,10 @@ class Node(BaseModel, NodeContent, DeletableContent):
     def leaf(self):\r
         return NodeMetaClass.types[self.node_type].objects.get(id=self.id)\r
 \r
     def leaf(self):\r
         return NodeMetaClass.types[self.node_type].objects.get(id=self.id)\r
 \r

+    @property\r
+    def summary(self):\r
+        return strip_tags(self.html)[:300]\r
+\r

     def create_revision(self, user, **kwargs):\r
         revision = NodeRevision(author=user, **kwargs)\r
         \r
     def create_revision(self, user, **kwargs):\r
         revision = NodeRevision(author=user, **kwargs)\r
         \r


@@ -120,13 +126,17 @@ class Node(BaseModel, NodeContent, DeletableContent):
         self.title = revision.title\r
         self.tagnames = revision.tagnames\r
         self.body = revision.body\r
         self.title = revision.title\r
         self.tagnames = revision.tagnames\r
         self.body = revision.body\r

-        \r
-        self.last_edited_at = datetime.datetime.now()\r
-        self.last_edited_by = user\r
+\r
+        old_revision = self.active_revision\r

 \r
         self.active_revision = revision\r
         self.save()\r
 \r
 \r
         self.active_revision = revision\r
         self.save()\r
 \r

+        if not old_revision:\r
+            self.last_edited_at = datetime.datetime.now()\r
+            self.last_edited_by = user\r
+            node_create.send(sender=self.__class__, instance=self)\r
+\r

     def get_tag_list_if_changed(self):\r
         dirty = self.get_dirty_fields()\r
 \r
     def get_tag_list_if_changed(self):\r
         dirty = self.get_dirty_fields()\r
 \r