Fixing some encoding/decoding errors, including the akismate module, and fixed the...

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

diff --git a/forum/models/node.py b/forum/models/node.py
index dc3ecb93ff9b61130a1980ee4d947828e2c2a7cf..2299663dee822b52a3a1c636fd73ad038e680eef 100644 (file)
--- a/forum/models/node.py
+++ b/forum/models/node.py
@@ -178,9 +178,6 @@ class Node(BaseModel, NodeContent):
     score                 = models.IntegerField(default=0)\r
 \r
     state_string          = models.TextField(default='')\r
-\r
-    #deleted               = models.ForeignKey('Action', null=True, unique=True, related_name="deleted_node")\r
-    #in_moderation         = models.ForeignKey('Action', null=True, unique=True, related_name="moderated_node")\r
     last_edited           = models.ForeignKey('Action', null=True, unique=True, related_name="edited_node")\r
 \r
     last_activity_by       = models.ForeignKey(User, null=True)\r
@@ -191,10 +188,8 @@ class Node(BaseModel, NodeContent):
 \r
     extra_ref = models.ForeignKey('Node', null=True)\r
     extra_count = models.IntegerField(default=0)\r
-    #extra_action = models.ForeignKey('Action', null=True, related_name="extra_node")\r
-    \r
+\r
     marked = models.BooleanField(default=False)\r
-    #wiki = models.BooleanField(default=False)\r
 \r
     comment_count = DenormalizedField("children", node_type="comment", canceled=False)\r
     flag_count = DenormalizedField("flags")\r
@@ -242,9 +237,9 @@ class Node(BaseModel, NodeContent):
 \r
         return nis\r
 \r
-    #@property\r
-    #def deleted(self):\r
-    #    return self.nstate.deleted\r
+    @property\r
+    def deleted(self):\r
+        return self.nis.deleted\r
 \r
     @property    \r
     def absolute_parent(self):\r