From: hernani <hernani@0cfe37f9-358a-4d5e-be75-b63607b5c754>
Date: Tue, 25 May 2010 03:08:42 +0000 (+0000)
Subject: Fix in edit permissions and some small code tweaks.
X-Git-Tag: live~808
X-Git-Url: https://git.openstreetmap.org./osqa.git/commitdiff_plain/293ecbd0f64bcdf5e89ab05c7000a8cea772e1f6

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 564605e..e5f166b 100644
--- a/forum/models/answer.py
+++ b/forum/models/answer.py
@@ -7,9 +7,9 @@ class Answer(Node):
     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):
diff --git a/forum/models/node.py b/forum/models/node.py
index dc3ecb9..2299663 100644
--- a/forum/models/node.py
+++ b/forum/models/node.py
@@ -178,9 +178,6 @@ class Node(BaseModel, NodeContent):
     score                 = models.IntegerField(default=0)
 
     state_string          = models.TextField(default='')
-
-    #deleted               = models.ForeignKey('Action', null=True, unique=True, related_name="deleted_node")
-    #in_moderation         = models.ForeignKey('Action', null=True, unique=True, related_name="moderated_node")
     last_edited           = models.ForeignKey('Action', null=True, unique=True, related_name="edited_node")
 
     last_activity_by       = models.ForeignKey(User, null=True)
@@ -191,10 +188,8 @@ class Node(BaseModel, NodeContent):
 
     extra_ref = models.ForeignKey('Node', null=True)
     extra_count = models.IntegerField(default=0)
-    #extra_action = models.ForeignKey('Action', null=True, related_name="extra_node")
-    
+
     marked = models.BooleanField(default=False)
-    #wiki = models.BooleanField(default=False)
 
     comment_count = DenormalizedField("children", node_type="comment", canceled=False)
     flag_count = DenormalizedField("flags")
@@ -242,9 +237,9 @@ class Node(BaseModel, NodeContent):
 
         return nis
 
-    #@property
-    #def deleted(self):
-    #    return self.nstate.deleted
+    @property
+    def deleted(self):
+        return self.nis.deleted
 
     @property    
     def absolute_parent(self):
diff --git a/forum/models/question.py b/forum/models/question.py
index a7ecd22..1cc0884 100644
--- a/forum/models/question.py
+++ b/forum/models/question.py
@@ -20,9 +20,9 @@ class Question(Node):
     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):
diff --git a/forum/models/user.py b/forum/models/user.py
index cddfe35..a3714ae 100644
--- a/forum/models/user.py
+++ b/forum/models/user.py
@@ -217,7 +217,7 @@ class User(BaseModel, DjangoUser):
     @true_if_is_super_or_staff
     def can_edit_post(self, post):
         return self == post.author or self.reputation >= int(settings.REP_TO_EDIT_OTHERS
-        ) or (post.wiki and self.reputation >= int(settings.REP_TO_EDIT_WIKI))
+        ) or (post.nis.wiki and self.reputation >= int(settings.REP_TO_EDIT_WIKI))
 
     @true_if_is_super_or_staff
     def can_wikify(self, post):