mirror/peeringdb-peeringdb
1
0
Fork 0
mirror of https://github.com/peeringdb/peeringdb.git synced 2024-05-11 05:55:09 +00:00
Code Releases Activity

fix #444: default filter all in admin views

Browse Source 
fix #426: fix issue where asn email validation was case sensitive in some cases
disable test_locale_files as this is now handled by weblate and locale files no longer reside in this repo
This commit is contained in:
Stefan Pratter
2019-03-14 08:27:46 +00:00
parent 2e619ba4a8
commit 85bb3d0cd1
5 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
peeringdb_server/admin.py
View File

@@ -55,16 +55,19 @@ class StatusFilter(admin.SimpleListFilter):
title = _("Status")
parameter_name = "status"
dflt = "ok"
dflt = "all"
def lookups(self, request, model_admin):
return [("ok", "ok"), ("pending", "pending"), ("deleted", "deleted"),
("all", "all")]
def choices(self, cl):
val = self.value()
if val is None:
val = "all"
for lookup, title in self.lookup_choices:
yield {
'selected': self.value() == lookup,
'selected': val == lookup,
'query_string': cl.get_query_string({
self.parameter_name: lookup
}, []),
@@ -72,9 +75,7 @@ class StatusFilter(admin.SimpleListFilter):
}
def queryset(self, request, queryset):
if self.value() is None:
return queryset.filter(**{self.parameter_name: self.dflt})
elif self.value() == "all":
if self.value() is None or self.value() == "all":
return queryset.all()
return queryset.filter(**{self.parameter_name: self.value()})