Browse Source

improve banking filtering

Élie Bouttier 7 years ago
parent
commit
1dcb04f0ac
1 changed files with 6 additions and 3 deletions
  1. 6 3
      banking/admin.py

+ 6 - 3
banking/admin.py

@@ -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)