Fix in edit permissions and some small code tweaks.

git-svn-id: http://svn.osqa.net/svnroot/osqa/trunk@323 0cfe37f9-358a-4d5e-be75-b63607b5c754

diff --git a/forum/models/answer.py b/forum/models/answer.py
index 564605e7d227d42a830ecdb376d2e760dd30f6c0..e5f166bd50657a994505adc5d5b9cf687a507010 100644 (file)
--- a/forum/models/answer.py
+++ b/forum/models/answer.py
@@ -7,9 +7,9 @@ class Answer(Node):
     class Meta(Node.Meta):
         proxy = True
 
     class Meta(Node.Meta):
         proxy = True
 

-    #@property
-    #def accepted(self):
-    #    return self.nstate.accepted
+    @property
+    def accepted(self):
+        return self.nis.accepted

 
     @property
     def headline(self):
 
     @property
     def headline(self):

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
     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
     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
 \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
     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
 \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
 \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
 \r
     @property    \r
     def absolute_parent(self):\r

diff --git a/forum/models/question.py b/forum/models/question.py
index a7ecd221d549f055d9ab790325014db67daa8209..1cc0884fcd79b615c00781f5a2afa5eb5247d0b1 100644 (file)
--- a/forum/models/question.py
+++ b/forum/models/question.py
@@ -20,9 +20,9 @@ class Question(Node):
     friendly_name = _("question")
     objects = QuestionManager()
 
     friendly_name = _("question")
     objects = QuestionManager()
 

-    #@property
-    #def closed(self):
-    #    return self.nstate.closed
+    @property
+    def closed(self):
+        return self.nis.closed

 
     @property    
     def view_count(self):
 
     @property    
     def view_count(self):

diff --git a/forum/models/user.py b/forum/models/user.py
index cddfe35c3388fb9134ec65330b697583a4c60263..a3714ae9c4212135b9bc871be6ebd7b2a7441f48 100644 (file)
--- a/forum/models/user.py
+++ b/forum/models/user.py
@@ -217,7 +217,7 @@ class User(BaseModel, DjangoUser):
     @true_if_is_super_or_staff\r
     def can_edit_post(self, post):\r
         return self == post.author or self.reputation >= int(settings.REP_TO_EDIT_OTHERS\r
     @true_if_is_super_or_staff\r
     def can_edit_post(self, post):\r
         return self == post.author or self.reputation >= int(settings.REP_TO_EDIT_OTHERS\r

-        ) or (post.wiki and self.reputation >= int(settings.REP_TO_EDIT_WIKI))\r
+        ) or (post.nis.wiki and self.reputation >= int(settings.REP_TO_EDIT_WIKI))\r

 \r
     @true_if_is_super_or_staff\r
     def can_wikify(self, post):\r
 \r
     @true_if_is_super_or_staff\r
     def can_wikify(self, post):\r