Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix Empty Queryset for Unbound Filter Form #987

Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions django_filters/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,8 @@ def get(self, request, *args, **kwargs):

if self.filterset.is_valid() or not self.get_strict():
self.object_list = self.filterset.qs
elif not self.filterset.is_bound:
self.object_list = self.get_queryset()
else:
self.object_list = self.filterset.queryset.none()

Expand Down
2 changes: 1 addition & 1 deletion tests/templates/tests/book_filter.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{{ filter.form }}

{% for obj in filter.qs %}
{% for obj in object_list %}
{{ obj }}
{% endfor %}
15 changes: 14 additions & 1 deletion tests/test_views.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ def test_view_with_filterset_not_model(self):
factory = RequestFactory()
request = factory.get(self.base_url)
filterset = filterset_factory(Book)
view = FilterView.as_view(filterset_class=filterset)
view = FilterView.as_view(filterset_class=filterset, queryset=Book.objects.all())
response = view(request)
self.assertEqual(response.status_code, 200)
for b in ['Ender's Game', 'Rainbow Six', 'Snowcrash']:
Expand Down Expand Up @@ -123,6 +123,19 @@ class View(FilterView):
self.assertEqual(message, expected)
self.assertEqual(len(recorded), 0)

def test_view_with_unbound_filter_form_returns_initial_queryset(self):
factory = RequestFactory()
request = factory.get(self.base_url)

queryset = Book.objects.filter(title='Snowcrash')
view = FilterView.as_view(model=Book, queryset=queryset)

response = view(request)
titles = [o.title for o in response.context_data['object_list']]

self.assertEqual(response.status_code, 200)
self.assertEqual(titles, ['Snowcrash'])


class GenericFunctionalViewTests(GenericViewTestCase):
base_url = '/books-legacy/'
Expand Down