Skip to content

Commit

Permalink
pep8
Browse files Browse the repository at this point in the history
  • Loading branch information
benjaoming committed Jul 18, 2014
1 parent bacba8d commit a7acc42
Showing 1 changed file with 45 additions and 18 deletions.
63 changes: 45 additions & 18 deletions wiki/managers.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@


class ArticleQuerySet(QuerySet):

def can_read(self, user):
"""Filter objects so only the ones with a user's reading access
are included"""
Expand All @@ -20,7 +20,7 @@ def can_read(self, user):
(Q(group__user=user) & Q(group_read=True))
)
return q

def can_write(self, user):
"""Filter objects so only the ones with a user's writing access
are included"""
Expand All @@ -34,12 +34,13 @@ def can_write(self, user):
(Q(group__user=user) & Q(group_write=True))
)
return q

def active(self):
return self.filter(current_revision__deleted=False)


class ArticleFkQuerySetMixin():

def can_read(self, user):
"""Filter objects so only the ones with a user's reading access
are included"""
Expand All @@ -49,12 +50,12 @@ def can_read(self, user):
q = self.filter(article__other_read=True)
else:
# https://github.com/benjaoming/django-wiki/issues/67
q = self.filter(Q(article__other_read=True) |
Q(article__owner=user) |
(Q(article__group__user=user) & Q(article__group_read=True))
).distinct()
q = self.filter(
Q(article__other_read=True) | Q(article__owner=user) |
(Q(article__group__user=user) & Q(
article__group_read=True))).distinct()
return q

def can_write(self, user):
"""Filter objects so only the ones with a user's writing access
are included"""
Expand All @@ -64,50 +65,68 @@ def can_write(self, user):
q = self.filter(article__other_write=True)
else:
# https://github.com/benjaoming/django-wiki/issues/67
q = self.filter(Q(article__other_write=True) |
Q(article__owner=user) |
(Q(article__group__user=user) & Q(article__group_write=True))
).distinct()
q = self.filter(
Q(article__other_write=True) | Q(article__owner=user) |
(Q(article__group__user=user) & Q(
article__group_write=True))).distinct()
return q

def active(self):
return self.filter(article__current_revision__deleted=False)


class ArticleFkEmptyQuerySetMixin():

def can_read(self, user):
return self

def can_write(self, user):
return self

def active(self):
return self


class ArticleFkQuerySet(ArticleFkQuerySetMixin, QuerySet):
pass


class ArticleFkEmptyQuerySet(ArticleFkEmptyQuerySetMixin, EmptyQuerySet):
pass


class ArticleManager(models.Manager):

def get_empty_query_set(self):
return self.get_query_set().none()

def get_query_set(self):
return ArticleQuerySet(self.model, using=self._db)

def active(self):
return self.get_query_set().active()

def can_read(self, user):
return self.get_query_set().can_read(user)

def can_write(self, user):
return self.get_query_set().can_write(user)


class ArticleFkManager(models.Manager):

def get_empty_query_set(self):
return ArticleFkEmptyQuerySet(model=self.model)

def get_query_set(self):
return ArticleFkQuerySet(self.model, using=self._db)

def active(self):
return self.get_query_set().active()

def can_read(self, user):
return self.get_query_set().can_read(user)

def can_write(self, user):
return self.get_query_set().can_write(user)

Expand All @@ -117,26 +136,34 @@ class URLPathEmptyQuerySet(EmptyQuerySet, ArticleFkEmptyQuerySetMixin):
def select_related_common(self):
return self


class URLPathQuerySet(QuerySet, ArticleFkQuerySetMixin):

def select_related_common(self):
return self.select_related("parent", "article__current_revision", "article__owner")
return self.select_related(
"parent",
"article__current_revision",
"article__owner")


class URLPathManager(TreeManager):

def get_empty_query_set(self):
return URLPathEmptyQuerySet(model=self.model)

def get_query_set(self):
"""Return a QuerySet with the same ordering as the TreeManager."""
return URLPathQuerySet(self.model, using=self._db).order_by(
self.tree_id_attr, self.left_attr)

def select_related_common(self):
return self.get_query_set().common_select_related()

def active(self):
return self.get_query_set().active()

def can_read(self, user):
return self.get_query_set().can_read(user)

def can_write(self, user):
return self.get_query_set().can_write(user)

0 comments on commit a7acc42

Please sign in to comment.