Skip to content

Update usage to get_queryset #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 4, 2015
Merged

Update usage to get_queryset #1

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e47fb01
Update usage to get_queryset
jbkkd Jun 4, 2015
1ff965a
Update more usage to get_queryset
jbkkd Jun 4, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions logicaldelete/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,17 @@


class LogicalDeletedManager(models.Manager):
def get_query_set(self):
def get_queryset(self):
if self.model:
return super(LogicalDeletedManager, self).get_query_set().filter(date_removed__isnull=True)
return super(LogicalDeletedManager, self).get_queryset().filter(date_removed__isnull=True)

def everything(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(date_removed__isnull=False)
return super(LogicalDeletedManager, self).get_queryset().filter(date_removed__isnull=False)

def get(self, *args, **kwargs):
''' if a specific record was requested, return it even if it's deleted '''
Expand All @@ -23,7 +23,7 @@ def filter(self, *args, **kwargs):
''' if pk was specified as a kwarg, return even if it's deleted '''
if 'pk' in kwargs:
return self.everything().filter(*args, **kwargs)
return self.get_query_set().filter(*args, **kwargs)
return self.get_queryset().filter(*args, **kwargs)


class LogicalDeleteModel(models.Model):
Expand Down