django-unfold 0.22.0__py3-none-any.whl → 0.24.0__py3-none-any.whl

unfold/contrib/filters/forms.py

@@ -1,7 +1,35 @@
 from django import forms
 from django.utils.translation import gettext_lazy as _
 
-from ...widgets import INPUT_CLASSES, UnfoldAdminSplitDateTimeVerticalWidget
+from ...widgets import (
+    INPUT_CLASSES,
+    UnfoldAdminSelectWidget,
+    UnfoldAdminSplitDateTimeVerticalWidget,
+    UnfoldAdminTextInputWidget,
+)
+
+
+class SearchForm(forms.Form):
+    def __init__(self, name, label, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+
+        self.fields[name] = forms.CharField(
+            label=label,
+            required=False,
+            widget=UnfoldAdminTextInputWidget,
+        )
+
+
+class DropdownForm(forms.Form):
+    def __init__(self, name, label, choices, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+
+        self.fields[name] = forms.ChoiceField(
+            label=label,
+            required=False,
+            choices=choices,
+            widget=UnfoldAdminSelectWidget,
+        )
 
 
 class SingleNumericForm(forms.Form):

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-gray-700 text-sm dark:text-gray-200">{% blocktrans with filter_title=title %}By {{ filter_title }}{% endblocktrans %}</h3>
+        <h3 class="font-medium mb-2 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 %}

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-gray-700 text-sm dark:text-gray-200">{% blocktrans with filter_title=title %}By {{ filter_title }}{% endblocktrans %}</h3>
+        <h3 class="font-medium mb-2 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 %}

unfold/contrib/filters/templates/unfold/filters/filters_field.html

@@ -0,0 +1,7 @@
+{% load i18n %}
+
+{% with choices.0 as choice %}
+    {% for field in choice.form %}
+        {% include "unfold/helpers/field.html" %}
+    {% endfor %}
+{% endwith %}

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-gray-700 text-sm dark:text-gray-200">{% blocktrans with filter_title=title %}By {{ filter_title }}{% endblocktrans %}</h3>
+        <h3 class="font-medium mb-2 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 %}

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-gray-700 text-sm dark:text-gray-200">{% blocktrans with filter_title=title %}By {{ filter_title }}{% endblocktrans %}</h3>
+        <h3 class="font-medium mb-2 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 %}">

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-gray-700 text-sm dark:text-gray-200">
+        <h3 class="font-medium mb-2 text-gray-700 text-sm dark:text-gray-200">
             {% blocktrans with filter_title=title %}By {{ filter_title }}{% endblocktrans %}
         </h3>
 

unfold/contrib/import_export/admin.py

@@ -7,7 +7,7 @@ from unfold.widgets import SELECT_CLASSES
 
 def export_action_form_factory(formats):
     class _ExportActionForm(ActionForm):
-        file_format = forms.ChoiceField(
+        format = forms.ChoiceField(
             label=" ",
             choices=formats,
             required=False,

unfold/contrib/import_export/forms.py

@@ -1,16 +1,15 @@
-from import_export.forms import ExportForm as BaseExportForm
-from import_export.forms import ImportForm as BaseImportForm
+from import_export.forms import ImportExportFormBase as BaseImportExportFormBase
 from unfold.widgets import SELECT_CLASSES, UnfoldAdminFileFieldWidget
 
 
-class ImportForm(BaseImportForm):
+class ImportForm(BaseImportExportFormBase):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
-        self.fields["import_file"].widget = UnfoldAdminFileFieldWidget()
-        self.fields["input_format"].widget.attrs["class"] = " ".join(SELECT_CLASSES)
+        self.fields["resource"].widget = UnfoldAdminFileFieldWidget()
+        self.fields["format"].widget.attrs["class"] = " ".join(SELECT_CLASSES)
 
 
-class ExportForm(BaseExportForm):
+class ExportForm(BaseImportExportFormBase):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
-        self.fields["file_format"].widget.attrs["class"] = " ".join(SELECT_CLASSES)
+        self.fields["format"].widget.attrs["class"] = " ".join(SELECT_CLASSES)

unfold/contrib/import_export/templates/admin/import_export/export.html

@@ -37,7 +37,7 @@
         {% csrf_token %}
 
         <fieldset class="border border-gray-200 mb-8 rounded-md pt-3 px-3 shadow-sm dark:border-gray-800">
-            {% include "unfold/helpers/field.html" with field=form.file_format %}
+            {% include "unfold/helpers/field.html" with field=form.format %}
         </fieldset>
 
         <button type="submit" class="bg-primary-600 border border-transparent font-medium px-3 py-2 rounded-md text-sm text-white">

unfold/contrib/import_export/templates/admin/import_export/import_form.html

@@ -22,9 +22,9 @@
         </p>
 
         <fieldset class="border border-gray-200 mb-8 rounded-md pt-3 px-3 shadow-sm dark:border-gray-800">
-        {% include "unfold/helpers/field.html" with field=form.import_file %}
+        {% include "unfold/helpers/field.html" with field=form.resource %}
 
-        {% include "unfold/helpers/field.html" with field=form.input_format %}
+        {% include "unfold/helpers/field.html" with field=form.format %}
         </fieldset>
 
 

unfold/forms.py

@@ -22,7 +22,12 @@ from .widgets import BASE_INPUT_CLASSES, INPUT_CLASSES, SELECT_CLASSES
 class ActionForm(forms.Form):
     action = forms.ChoiceField(
         label="",
-        widget=forms.Select({"class": " ".join([*SELECT_CLASSES, "w-72"])}),
+        widget=forms.Select(
+            {
+                "class": " ".join([*SELECT_CLASSES, "max-w-full", "lg:!w-64"]),
+                "x-model": "action",
+            }
+        ),
     )
 
     select_across = forms.BooleanField(

unfold/sites.py

@@ -205,7 +205,7 @@ class UnfoldAdminSite(AdminSite):
 
         from .forms import AdminOwnPasswordChangeForm
 
-        url = reverse("admin:password_change_done", current_app=self.name)
+        url = reverse(f"{self.name}:password_change_done", current_app=self.name)
         defaults = {
             "form_class": AdminOwnPasswordChangeForm,
             "success_url": url,
@@ -224,9 +224,9 @@ class UnfoldAdminSite(AdminSite):
             if not isinstance(link, str):
                 link = str(link)
 
-            if link in request.path and link != reverse_lazy("admin:index"):
+            if link in request.path and link != reverse_lazy(f"{self.name}:index"):
                 return True
-            elif link == request.path == reverse_lazy("admin:index"):
+            elif link == request.path == reverse_lazy(f"{self.name}:index"):
                 return True
 
             return False