a number of updates
This commit is contained in:
+8
-2
@@ -50,6 +50,7 @@ class UserUserFilter(django_filters.FilterSet):
|
||||
#"userprofile__grade": ["exact"],
|
||||
#"userprofile__supervisor": ["exact"],
|
||||
"email": ["contains"],
|
||||
"is_active": ["exact"]
|
||||
}
|
||||
|
||||
@property
|
||||
@@ -57,11 +58,16 @@ class UserUserFilter(django_filters.FilterSet):
|
||||
parent = super().qs
|
||||
|
||||
## filter_active = getattr(self.request, 'active', True)
|
||||
#if "active" not in self.request.GET:
|
||||
# return parent.filter(active=True)
|
||||
if "is_active" not in self.request.GET:
|
||||
return parent.filter(is_active=True)
|
||||
|
||||
return parent
|
||||
|
||||
def __init__(self, *args, **kwargs):
|
||||
super(UserUserFilter, self).__init__(*args, **kwargs)
|
||||
self.form.initial['is_active'] = True
|
||||
|
||||
|
||||
class ExaminationFilter(django_filters.FilterSet):
|
||||
class Meta:
|
||||
model = Examination
|
||||
|
||||
Reference in New Issue
Block a user