Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions src/unfold/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,23 +26,28 @@ class DatasetChangeList(ChangeList):
is_dataset = True

def __init__(self, request: HttpRequest, *args: Any, **kwargs: Any) -> None:
search_var = f"{kwargs.get('model')._meta.model_name}-q"
page_var = f"{kwargs.get('model')._meta.model_name}-p"
self.search_var = f"{kwargs.get('model')._meta.model_name}-q"
self.page_var = f"{kwargs.get('model')._meta.model_name}-p"

_search_form = DatasetChangeListSearchForm(request.GET, search_var=search_var)
_search_form = DatasetChangeListSearchForm(
request.GET, search_var=self.search_var
)
if not _search_form.is_valid():
for error in _search_form.errors.values():
messages.error(request, ", ".join(error))

self.dataset_search_query = _search_form.cleaned_data.get(search_var) or ""
self.dataset_search_query = _search_form.cleaned_data.get(self.search_var) or ""

super().__init__(request, *args, **kwargs)

def get_results(self, request: HttpRequest) -> None:
try:
self.page_num = int(request.GET.get(page_var, 1))
self.page_num = int(request.GET.get(self.page_var, 1))
except ValueError:
self.page_num = 1

super().get_results(request)

def get_queryset(self, request, exclude_parameters=None):
self.query = self.dataset_search_query
return super().get_queryset(request, exclude_parameters)
Expand Down