fix: range filters wrong arguments (#293)

Author: lukasvinclav

src/unfold/contrib/filters/admin.py

@@ -57,7 +57,10 @@ def __init__(
 
         if self.parameter_name in params:
             value = params.pop(self.parameter_name)
-            self.used_parameters[self.parameter_name] = value
+            value = value[0] if isinstance(value, list) else value
+
+            if value not in EMPTY_VALUES:
+                self.used_parameters[self.parameter_name] = value
 
     def queryset(
         self, request: HttpRequest, queryset: QuerySet[Any]
@@ -94,11 +97,16 @@ class RangeNumericMixin:
     def init_used_parameters(self, params: Dict[str, Any]) -> None:
         if self.parameter_name + "_from" in params:
             value = params.pop(self.parameter_name + "_from")
-            self.used_parameters[self.parameter_name + "_from"] = value
+
+            self.used_parameters[self.parameter_name + "_from"] = (
+                value[0] if isinstance(value, list) else value
+            )
 
         if self.parameter_name + "_to" in params:
             value = params.pop(self.parameter_name + "_to")
-            self.used_parameters[self.parameter_name + "_to"] = value
+            self.used_parameters[self.parameter_name + "_to"] = (
+                value[0] if isinstance(value, list) else value
+            )
 
     def queryset(self, request: HttpRequest, queryset: QuerySet) -> QuerySet:
         filters = {}
@@ -302,11 +310,17 @@ def __init__(
 
         if self.parameter_name + "_from" in params:
             value = params.pop(self.field_path + "_from")
-            self.used_parameters[self.field_path + "_from"] = value
+            value = value[0] if isinstance(value, list) else value
+
+            if value not in EMPTY_VALUES:
+                self.used_parameters[self.field_path + "_from"] = value
 
         if self.parameter_name + "_to" in params:
             value = params.pop(self.field_path + "_to")
-            self.used_parameters[self.field_path + "_to"] = value
+            value = value[0] if isinstance(value, list) else value
+
+            if value not in EMPTY_VALUES:
+                self.used_parameters[self.field_path + "_to"] = value
 
     def queryset(self, request: HttpRequest, queryset: QuerySet) -> QuerySet:
         filters = {}

src/unfold/contrib/filters/templates/unfold/filters/filters_date_range.html

@@ -2,7 +2,7 @@
 
 {% with choices.0 as choice %}
     <div class="flex flex-col mb-6">
-        <h3 class="font-medium mb-4 text-sm">{% blocktrans with filter_title=title %}By {{ filter_title }}{% endblocktrans %}</h3>
+        <h3 class="font-medium mb-4 text-gray-700 text-sm dark:text-gray-200">{% blocktrans with filter_title=title %}By {{ filter_title }}{% endblocktrans %}</h3>
 
         <div class="flex flex-col space-y-4">
             {% for field in choice.form %}

src/unfold/contrib/filters/templates/unfold/filters/filters_datetime_range.html

@@ -2,7 +2,7 @@
 
 {% with choices.0 as choice %}
     <div class="flex flex-col mb-6">
-        <h3 class="font-medium mb-4 text-sm">{% blocktrans with filter_title=title %}By {{ filter_title }}{% endblocktrans %}</h3>
+        <h3 class="font-medium mb-4 text-gray-700 text-sm dark:text-gray-200">{% blocktrans with filter_title=title %}By {{ filter_title }}{% endblocktrans %}</h3>
 
         <div class="flex flex-col space-y-4">
             {% for field in choice.form %}

src/unfold/contrib/filters/templates/unfold/filters/filters_numeric_range.html

@@ -2,7 +2,7 @@
 
 {% with choices.0 as choice %}
     <div class="flex flex-col mb-6">
-        <h3 class="font-medium mb-4 text-sm">{% blocktrans with filter_title=title %}By {{ filter_title }}{% endblocktrans %}</h3>
+        <h3 class="font-medium mb-4 text-gray-700 text-sm dark:text-gray-200">{% blocktrans with filter_title=title %}By {{ filter_title }}{% endblocktrans %}</h3>
 
         <div class="flex flex-row gap-4">
             {% for field in choice.form %}

src/unfold/contrib/filters/templates/unfold/filters/filters_numeric_single.html

@@ -2,7 +2,7 @@
 
 {% with choices.0 as choice %}
     <div class="flex flex-col mb-6">
-        <h3 class="font-medium mb-4 text-sm">{% blocktrans with filter_title=title %}By {{ filter_title }}{% endblocktrans %}</h3>
+        <h3 class="font-medium mb-4 text-gray-700 text-sm dark:text-gray-200">{% blocktrans with filter_title=title %}By {{ filter_title }}{% endblocktrans %}</h3>
 
         {% for field in choice.form %}
             <div class="flex flex-row flex-wrap group relative{% if field.errors %} errors{% endif %}">

src/unfold/contrib/filters/templates/unfold/filters/filters_numeric_slider.html

@@ -3,7 +3,7 @@
 
 {% with choices.0 as choice %}
     <div class="admin-numeric-filter-wrapper mb-6">
-        <h3 class="font-medium mb-4 text-sm">
+        <h3 class="font-medium mb-4 text-gray-700 text-sm dark:text-gray-200">
             {% blocktrans with filter_title=title %}By {{ filter_title }}{% endblocktrans %}
         </h3>
 

src/unfold/templates/admin/filter.html

@@ -5,10 +5,16 @@ <h3 class="font-medium mb-4 text-gray-700 text-sm dark:text-gray-200">
         {% blocktranslate with filter_title=title %} By {{ filter_title }} {% endblocktranslate %}
     </h3>
 
+    {% for choice in choices %}
+        {% if choice.selected %}
+            <input type="hidden" name="{{ spec.lookup_kwarg }}" value="{{ spec.lookup_val.0 }}" />
+        {% endif %}
+    {% endfor %}
+
     {% if spec|class_name == "BooleanFieldListFilter" %}
         <ul class="border-l-4 border-gray-200 flex pl-4 py-2 text-gray-500 text-sm dark:border-gray-700">
             {% for choice in choices %}
-                <li class="{% if choice.selected %}font-medium text-primary-600 underline{% else %}text-gray-500 hover:text-gray-700 dark:text-gray-400 dark:hover:text-gray-200{% endif %} pr-4">
+                <li class="{% if choice.selected %}font-medium text-primary-500 underline dark{% else %}text-gray-500 hover:text-gray-700 dark:text-gray-400 dark:hover:text-gray-200{% endif %} pr-4">
                     <a href="{{ choice.query_string|iriencode }}" title="{{ choice.display }}">
                         {{ choice.display }}
                     </a>
@@ -18,7 +24,7 @@ <h3 class="font-medium mb-4 text-gray-700 text-sm dark:text-gray-200">
     {% else %}
         <ul class="border-l-4 border-gray-200 flex flex-col pl-4 py-4 text-gray-500 text-sm dark:border-gray-700">
             {% for choice in choices %}
-                <li class="mb-4 last:mb-0 {% if choice.selected %}font-medium text-primary-600 underline {% else %}text-gray-500 hover:text-gray-700 dark:text-gray-400 dark:hover:text-gray-200{% endif %}">
+                <li class="mb-4 last:mb-0 {% if choice.selected %}font-medium text-primary-500 underline {% else %}text-gray-500 hover:text-gray-700 dark:text-gray-400 dark:hover:text-gray-200{% endif %}">
                     <a href="{{ choice.query_string|iriencode }}" title="{{ choice.display }}">
                         {{ choice.display }}
                     </a>

src/unfold/templates/unfold/change_list_filter.html

@@ -3,7 +3,7 @@
 <div id="changelist-filter" class="backdrop-blur-sm bg-opacity-80 bg-gray-900 flex fixed inset-0 z-50" x-show="filterOpen">
     <label for="show-filters" id="changelist-filter-close" class="flex-grow"></label>
 
-    <div class="bg-white flex mr-4 my-4 overflow-hidden rounded shadow-sm w-96 dark:bg-gray-800">
+    <div class="bg-white flex mr-4 my-4 overflow-hidden rounded shadow-sm w-96 dark:bg-gray-800" x-on:click.outside="filterOpen = false">
         <div class="flex-grow h-full overflow-auto relative">
             <h3 class="border-b flex font-medium mb-6 px-6 py-4 text-gray-700 text-sm dark:text-gray-200 dark:border-gray-700">
                 {% trans "Filter results" %}
@@ -22,12 +22,6 @@ <h3 class="border-b flex font-medium mb-6 px-6 py-4 text-gray-700 text-sm dark:t
             <div class="px-6{% if cl.model_admin.list_filter_submit %} pb-16{% endif %}">
                 {% if cl.model_admin.list_filter_submit %}
                     <form method="get">
-
-                    {% for k, v in request.GET.items %}
-                        {% if not k == choice.parameter_name|add:'_from' and not k == choice.parameter_name|add:'_to' %}
-                            <input type="hidden" name="{{ k }}" value="{{ v }}">
-                        {% endif %}
-                    {% endfor %}
                 {% endif %}