|
@@ -41,8 +41,9 @@ class PaymentStatusFilter(admin.SimpleListFilter):
|
|
|
|
|
|
def lookups(self, request, model_admin):
|
|
|
return (
|
|
|
- (0, 'Inactif'),
|
|
|
- (1, 'Actif'),
|
|
|
+ (0, 'Non renseigné'),
|
|
|
+ (1, 'Inactif'),
|
|
|
+ (2, 'Actif'),
|
|
|
)
|
|
|
|
|
|
def queryset(self, request, queryset):
|
|
@@ -51,8 +52,10 @@ class PaymentStatusFilter(admin.SimpleListFilter):
|
|
|
actives = filter(lambda p: p['payment_method'] != PaymentUpdate.STOP, payments)
|
|
|
actives = map(lambda p: p['payment__pk'], actives)
|
|
|
if self.value() == '0':
|
|
|
- return queryset.exclude(pk__in=actives)
|
|
|
+ return queryset.exclude(pk__in=actives).filter(updates__isnull=True)
|
|
|
if self.value() == '1':
|
|
|
+ return queryset.exclude(pk__in=actives).exclude(updates__isnull=True)
|
|
|
+ if self.value() == '2':
|
|
|
return queryset.filter(pk__in=actives)
|
|
|
|
|
|
|