django-unfold 0.53.0__tar.gz → 0.54.0__tar.gz

{django_unfold-0.53.0 → django_unfold-0.54.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: django-unfold
-Version: 0.53.0
+Version: 0.54.0
 Summary: Modern Django admin theme for seamless interface development
 License: MIT
 Keywords: django,admin,tailwind,theme

{django_unfold-0.53.0 → django_unfold-0.54.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "django-unfold"
-version = "0.53.0"
+version = "0.54.0"
 description = "Modern Django admin theme for seamless interface development"
 license = "MIT"
 readme = "README.md"

{django_unfold-0.53.0 → django_unfold-0.54.0}/src/unfold/contrib/filters/admin/__init__.py

@@ -2,6 +2,15 @@ from unfold.contrib.filters.admin.autocomplete_filters import (
     AutocompleteSelectFilter,
     AutocompleteSelectMultipleFilter,
 )
+from unfold.contrib.filters.admin.choice_filters import (
+    AllValuesCheckboxFilter,
+    BooleanRadioFilter,
+    CheckboxFilter,
+    ChoicesCheckboxFilter,
+    ChoicesRadioFilter,
+    RadioFilter,
+    RelatedCheckboxFilter,
+)
 from unfold.contrib.filters.admin.datetime_filters import (
     RangeDateFilter,
     RangeDateTimeFilter,
@@ -23,12 +32,20 @@ from unfold.contrib.filters.admin.numeric_filters import (
 from unfold.contrib.filters.admin.text_filters import FieldTextFilter, TextFilter
 
 __all__ = [
+    "AllValuesCheckboxFilter",
+    "BooleanRadioFilter",
+    "CheckboxFilter",
+    "ChoicesCheckboxFilter",
+    "ChoicesRadioFilter",
+    "MultipleRelatedCheckboxFilter",
+    "RadioFilter",
     "ChoicesDropdownFilter",
     "MultipleChoicesDropdownFilter",
     "DropdownFilter",
     "RelatedDropdownFilter",
     "MultipleDropdownFilter",
     "MultipleRelatedDropdownFilter",
+    "RelatedCheckboxFilter",
     "FieldTextFilter",
     "TextFilter",
     "RangeDateFilter",

django_unfold-0.54.0/src/unfold/contrib/filters/admin/choice_filters.py

@@ -0,0 +1,134 @@
+from collections.abc import Generator
+from typing import Any
+
+from django.contrib import admin
+from django.contrib.admin.views.main import ChangeList
+from django.core.validators import EMPTY_VALUES
+from django.db.models import QuerySet
+from django.http import HttpRequest
+from django.utils.translation import gettext_lazy as _
+
+from unfold.contrib.filters.admin.mixins import MultiValueMixin, ValueMixin
+from unfold.contrib.filters.forms import CheckboxForm, HorizontalRadioForm, RadioForm
+
+
+class RadioFilter(admin.SimpleListFilter):
+    template = "unfold/filters/filters_field.html"
+    form_class = RadioForm
+    all_option = ["", _("All")]
+
+    def choices(self, changelist: ChangeList) -> tuple[dict[str, Any], ...]:
+        if self.all_option:
+            choices = [self.all_option, *self.lookup_choices]
+        else:
+            choices = self.lookup_choices
+
+        return (
+            {
+                "form": self.form_class(
+                    label=_(" By %(filter_title)s ") % {"filter_title": self.title},
+                    name=self.parameter_name,
+                    choices=choices,
+                    data={self.parameter_name: self.value()},
+                ),
+            },
+        )
+
+
+class CheckboxFilter(RadioFilter):
+    form_class = CheckboxForm
+    all_option = None
+
+
+class ChoicesMixin:
+    template = "unfold/filters/filters_field.html"
+
+    def choices(self, changelist: ChangeList) -> Generator[dict[str, Any], None, None]:
+        if self.all_option:
+            choices = [self.all_option, *self.field.flatchoices]
+        else:
+            choices = self.field.flatchoices
+
+        yield {
+            "form": self.form_class(
+                label=_(" By %(filter_title)s ") % {"filter_title": self.title},
+                name=self.lookup_kwarg,
+                choices=choices,
+                data={self.lookup_kwarg: self.value()},
+            ),
+        }
+
+
+class ChoicesRadioFilter(ValueMixin, ChoicesMixin, admin.ChoicesFieldListFilter):
+    form_class = RadioForm
+    all_option = ["", _("All")]
+
+
+class ChoicesCheckboxFilter(ValueMixin, ChoicesMixin, admin.ChoicesFieldListFilter):
+    form_class = CheckboxForm
+    all_option = None
+
+
+class BooleanRadioFilter(ValueMixin, admin.BooleanFieldListFilter):
+    template = "unfold/filters/filters_field.html"
+    form_class = HorizontalRadioForm
+    all_option = ["", _("All")]
+
+    def choices(self, changelist: ChangeList) -> Generator[dict[str, Any], None, None]:
+        choices = [
+            self.all_option,
+            *[
+                ("1", _("Yes")),
+                ("0", _("No")),
+            ],
+        ]
+
+        yield {
+            "form": self.form_class(
+                label=_(" By %(filter_title)s ") % {"filter_title": self.title},
+                name=self.lookup_kwarg,
+                choices=choices,
+                data={self.lookup_kwarg: self.value()},
+            ),
+        }
+
+
+class RelatedCheckboxFilter(MultiValueMixin, admin.RelatedFieldListFilter):
+    template = "unfold/filters/filters_field.html"
+    form_class = CheckboxForm
+
+    def queryset(self, request: HttpRequest, queryset: QuerySet) -> QuerySet:
+        if self.value() not in EMPTY_VALUES:
+            return super().queryset(request, queryset)
+
+        return queryset
+
+    def choices(self, changelist: ChangeList) -> Generator[dict[str, Any], None, None]:
+        yield {
+            "form": self.form_class(
+                label=_(" By %(filter_title)s ") % {"filter_title": self.title},
+                name=self.lookup_kwarg,
+                choices=self.lookup_choices,
+                data={self.lookup_kwarg: self.value()},
+            ),
+        }
+
+
+class AllValuesCheckboxFilter(MultiValueMixin, admin.AllValuesFieldListFilter):
+    template = "unfold/filters/filters_field.html"
+    form_class = CheckboxForm
+
+    def choices(self, changelist: ChangeList) -> Generator[dict[str, Any], None, None]:
+        choices = [[i, val] for i, val in enumerate(self.lookup_choices)]
+
+        if len(choices) == 0:
+            return
+
+        yield {
+            "form": self.form_class(
+                label=_(" By %(filter_title)s ") % {"filter_title": self.title},
+                name=self.lookup_kwarg,
+                choices=[[i, val] for i, val in enumerate(self.lookup_choices)],
+                data={self.lookup_kwarg: self.value()},
+            ),
+        }

{django_unfold-0.53.0 → django_unfold-0.54.0}/src/unfold/contrib/filters/forms.py

@@ -1,14 +1,20 @@
 from django import forms
+from django.contrib.admin.options import HORIZONTAL
 from django.contrib.admin.widgets import AutocompleteSelect, AutocompleteSelectMultiple
 from django.db.models import Field as ModelField
-from django.forms import ChoiceField, ModelMultipleChoiceField, MultipleChoiceField
+from django.forms import (
+    ChoiceField,
+    ModelMultipleChoiceField,
+    MultipleChoiceField,
+)
 from django.http import HttpRequest
 from django.utils.translation import gettext_lazy as _
 
 from unfold.admin import ModelAdmin
-
-from ...widgets import (
+from unfold.widgets import (
     INPUT_CLASSES,
+    UnfoldAdminCheckboxSelectMultiple,
+    UnfoldAdminRadioSelectWidget,
     UnfoldAdminSelectMultipleWidget,
     UnfoldAdminSelectWidget,
     UnfoldAdminSplitDateTimeVerticalWidget,
@@ -71,6 +77,38 @@ class AutocompleteDropdownForm(forms.Form):
         }
 
 
+class CheckboxForm(forms.Form):
+    field = MultipleChoiceField
+    widget = UnfoldAdminCheckboxSelectMultiple
+
+    def __init__(
+        self,
+        name: str,
+        label: str,
+        choices: tuple,
+        *args,
+        **kwargs,
+    ) -> None:
+        super().__init__(*args, **kwargs)
+
+        self.fields[name] = self.field(
+            label=label,
+            required=False,
+            choices=choices,
+            widget=self.widget,
+        )
+
+
+class RadioForm(CheckboxForm):
+    field = ChoiceField
+    widget = UnfoldAdminRadioSelectWidget
+
+
+class HorizontalRadioForm(RadioForm):
+    horizontal = True
+    widget = UnfoldAdminRadioSelectWidget(radio_style=HORIZONTAL)
+
+
 class DropdownForm(forms.Form):
     widget = UnfoldAdminSelectWidget(
         attrs={

{django_unfold-0.53.0 → django_unfold-0.54.0}/src/unfold/contrib/filters/templates/unfold/filters/filters_date_range.html

@@ -4,7 +4,7 @@
     <div class="flex flex-col">
         <h3 class="font-semibold mb-2 text-font-important-light dark:text-font-important-dark">{% blocktrans with filter_title=title %}By {{ filter_title }}{% endblocktrans %}</h3>
 
-        <div class="flex flex-col space-y-4">
+        <div class="flex flex-col space-y-2">
             {% for field in choice.form %}
                 <div class="flex flex-row flex-wrap group relative{% if field.errors %} errors{% endif %}">
                     {{ field }}

{django_unfold-0.53.0 → django_unfold-0.54.0}/src/unfold/contrib/filters/templates/unfold/filters/filters_datetime_range.html

@@ -4,7 +4,7 @@
     <div class="flex flex-col">
         <h3 class="font-semibold mb-2 text-font-important-light dark:text-font-important-dark">{% blocktrans with filter_title=title %}By {{ filter_title }}{% endblocktrans %}</h3>
 
-        <div class="flex flex-col space-y-4">
+        <div class="flex flex-col space-y-2">
             {% for field in choice.form %}
                 <div class="flex flex-row flex-wrap group relative{% if field.errors %} errors{% endif %}">
                     {{ field }}

{django_unfold-0.53.0 → django_unfold-0.54.0}/src/unfold/static/admin/js/inlines.js

@@ -96,12 +96,23 @@
         .removeClass(options.emptyCssClass)
         .addClass(options.formCssClass)
         .attr("id", options.prefix + "-" + nextIndex);
+
       addInlineDeleteButton(row);
       row.find("*").each(function () {
         updateElementIndex(this, options.prefix, totalForms.val());
       });
+
       // Insert the new form when it has been fully edited.
-      row.insertBefore($(template));
+      // !CHANGED from original
+      if ($(template).parent().is("tbody")) {
+        row
+          .wrap('<tbody class="template"></tbody>')
+          .parent()
+          .insertBefore($(template).parent());
+      } else {
+        row.insertBefore($(template));
+      }
+
       // Update number of total forms.
       $(totalForms).val(parseInt(totalForms.val(), 10) + 1);
       nextIndex += 1;
@@ -183,7 +194,13 @@
       if (prevRow.length && prevRow.hasClass("row-form-errors")) {
         prevRow.remove();
       }
-      row.remove();
+
+      // !CHANGED from original
+      if (deleteButton.parent().parent().parent().parent().is("tbody")) {
+        row.parent().remove();
+      } else {
+        row.remove();
+      }
       nextIndex -= 1;
       // Pass the deleted form to the post-delete callback, if provided.
       if (options.removed) {
@@ -245,8 +262,11 @@
     }
 
     // Create the delete buttons for all unsaved inlines:
+    // !CHANGED from original, added parent() and used find() instead of filter()
     $this
-      .filter(
+      .parent()
+      .parent()
+      .find(
         "." +
           options.formCssClass +
           ":not(.has_original):not(." +