Merge branch 'master' of github.com:benjaoming/django-wiki

wiki/managers.py

@@ -47,7 +47,7 @@ class ArticleFkQuerySetMixin():
     def can_read(self, user):
         """Filter objects so only the ones with a user's reading access
         are included"""
-        if user.has_perm('wiki.moderator'):
+        if user.has_perm('wiki.moderate'):
             return self
         if user.is_anonymous():
             q = self.filter(article__other_read=True)
@@ -61,7 +61,7 @@ class ArticleFkQuerySetMixin():
     def can_write(self, user):
         """Filter objects so only the ones with a user's writing access
         are included"""
-        if user.has_perm('wiki.moderator'):
+        if user.has_perm('wiki.moderate'):
             return self
         if user.is_anonymous():
             q = self.filter(article__other_write=True)

wiki/models/article.py

@@ -65,7 +65,7 @@ class Article(models.Model):
     
     def can_write(self, user=None):
         # Deny writing access to deleted articles if user has no delete access
-        if self.current_revision and self.current_revision.deleted and not self.can_delete(user):
+        if self.current_revision and self.current_revision.deleted and not self.can_moderate(user):
             return False
         # Check access for other users...
         if user.is_anonymous() and not settings.ANONYMOUS_WRITE:
@@ -96,11 +96,15 @@ class Article(models.Model):
             for descendant in obj.content_object.get_descendants():
                 yield descendant
     
-    def get_children(self, max_num=None, **kwargs):
+    def get_children(self, max_num=None, user_can_read=None, **kwargs):
         """NB! This generator is expensive, so use it with care!!"""
         cnt = 0
         for obj in self.articleforobject_set.filter(is_mptt=True):
-            for child in obj.content_object.get_children().filter(**kwargs).order_by('articles__article__current_revision__title'):
+            if user_can_read:
+                objects = obj.content_object.get_children().filter(**kwargs).can_read(user_can_read)
+            else:
+                objects = obj.content_object.get_children().filter(**kwargs)
+            for child in objects.order_by('articles__article__current_revision__title'):
                 cnt += 1
                 if max_num and cnt > max_num: return
                 yield child
@@ -187,6 +191,9 @@ class Article(models.Model):
         
     
 class ArticleForObject(models.Model):
+    
+    objects = managers.ArticleFkManager()
+    
     article = models.ForeignKey('Article', on_delete=models.CASCADE)
     # Same as django.contrib.comments
     content_type   = models.ForeignKey(ContentType,

wiki/views/mixins.py

@@ -14,7 +14,8 @@ class ArticleMixin(TemplateResponseMixin):
         self.children_slice = []
         if settings.SHOW_MAX_CHILDREN > 0:
             for child in self.article.get_children(max_num=settings.SHOW_MAX_CHILDREN+1,
-                                                   articles__article__current_revision__deleted=False):
+                                                   articles__article__current_revision__deleted=False,
+                                                   user_can_read=request.user):
                 self.children_slice.append(child)
         return super(ArticleMixin, self).dispatch(request, *args, **kwargs)