Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge pull request #8 from jeffbowen/master
Use get_queryset instead of get_query_set
  • Loading branch information
paltman committed Sep 28, 2014
2 parents 25daf69 + 3f7b1ce commit 4eb1533
Showing 1 changed file with 9 additions and 9 deletions.
18 changes: 9 additions & 9 deletions logicaldelete/managers.py
Expand Up @@ -9,27 +9,27 @@ class LogicalDeletedManager(models.Manager):
providing the filtering out of logically deleted objects. In addition, it
provides named querysets for getting the deleted objects.
"""
def get_query_set(self):

def get_queryset(self):
if self.model:
return LogicalDeleteQuerySet(self.model, using=self._db).filter(
date_removed__isnull=True
)

def all_with_deleted(self):
if self.model:
return super(LogicalDeletedManager, self).get_query_set()
return super(LogicalDeletedManager, self).get_queryset()

def only_deleted(self):
if self.model:
return super(LogicalDeletedManager, self).get_query_set().filter(
return super(LogicalDeletedManager, self).get_queryset().filter(
date_removed__isnull=False
)

def get(self, *args, **kwargs):
return self.all_with_deleted().get(*args, **kwargs)

def filter(self, *args, **kwargs):
if "pk" in kwargs:
return self.all_with_deleted().filter(*args, **kwargs)
return self.get_query_set().filter(*args, **kwargs)
return self.get_queryset().filter(*args, **kwargs)

0 comments on commit 4eb1533

Please sign in to comment.