Skip to content

Commit

Permalink
Update admin.py
Browse files Browse the repository at this point in the history
DRY
  • Loading branch information
bashu committed Jan 3, 2017
1 parent 62a4440 commit 572034c
Showing 1 changed file with 4 additions and 18 deletions.
22 changes: 4 additions & 18 deletions softdelete/admin/admin.py
Expand Up @@ -16,19 +16,14 @@ def __init__(self, parent, site, *args, **kwargs):
self.extra = 0
self.max_num = 0

def queryset(self, request):
qs = self.model._default_manager.all_with_deleted()
ordering = self.ordering or ()
if ordering:
qs = qs.order_by(*ordering)
return qs

def get_queryset(self, request):
qs = self.model._default_manager.all_with_deleted()
ordering = self.get_ordering(request) or ()
if ordering:
qs = qs.order_by(*ordering)
return qs

queryset = get_queryset

class SoftDeleteObjectAdmin(admin.ModelAdmin):
form = SoftDeleteObjectAdminForm
Expand All @@ -47,17 +42,6 @@ def response_change(self, request, obj, *args, **kwargs):
return HttpResponseRedirect('../')
return super(SoftDeleteObjectAdmin, self).response_change(request, obj, *args, **kwargs)

def queryset(self, request):
try:
qs = self.model._default_manager.all_with_deleted()
except Exception as ex:
qs = self.model._default_manager.all()

ordering = self.ordering or ()
if ordering:
qs = qs.order_by(*ordering)
return qs

def get_queryset(self, request):
try:
qs = self.model._default_manager.all_with_deleted()
Expand All @@ -68,6 +52,8 @@ def get_queryset(self, request):
if ordering:
qs = qs.order_by(*ordering)
return qs

queryset = get_queryset

class SoftDeleteRecordInline(admin.TabularInline):
model = SoftDeleteRecord
Expand Down

0 comments on commit 572034c

Please sign in to comment.