django-unfold 0.40.0__tar.gz → 0.42.0__tar.gz

{django_unfold-0.40.0 → django_unfold-0.42.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: django-unfold
-Version: 0.40.0
+Version: 0.42.0
 Summary: Modern Django admin theme for seamless interface development
 Home-page: https://unfoldadmin.com
 License: MIT
@@ -18,6 +18,7 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Requires-Dist: django (>=3.2)
 Project-URL: Repository, https://github.com/unfoldadmin/django-unfold
 Description-Content-Type: text/markdown
@@ -37,6 +38,9 @@ Unfold is a theme for Django admin that incorporates common best practices for b
 - **Unfold:** Demo site is available at [unfoldadmin.com](https://unfoldadmin.com?utm_medium=github&utm_source=unfold).
 - **Formula:** Repository with demo implementation at [github.com/unfoldadmin/formula](https://github.com/unfoldadmin/formula?utm_medium=github&utm_source=unfold).
 - **Turbo:** Django & Next.js boilerplate implementing Unfold at [github.com/unfoldadmin/turbo](https://github.com/unfoldadmin/turbo?utm_medium=github&utm_source=unfold).
+- **Discord:** Join the Unfold community on [Discord](https://discord.gg/9sQj9MEbNz).
+
+
 
 ## Are you using Unfold and need help?
 
@@ -56,6 +60,7 @@ Have you decided to start using Unfold but don’t have time to make the switch
 - **Inline tabs:** Groups inlines into tab navigation in the change form.
 - **Model tabs:** Allows defining custom tab navigation for models.
 - **Fieldset tabs:** Merges multiple fieldsets into tabs in the change form.
+- **Sortable inlines:** Allows sorting inlines by dragging and dropping.
 - **Environment label**: Distinguishes between environments by displaying a label.
 - **Nonrelated inlines**: Displays nonrelated models as inlines in the change form.
 - **Favicons**: Built-in support for configuring various site favicons.

{django_unfold-0.40.0 → django_unfold-0.42.0}/README.md

@@ -13,6 +13,9 @@ Unfold is a theme for Django admin that incorporates common best practices for b
 - **Unfold:** Demo site is available at [unfoldadmin.com](https://unfoldadmin.com?utm_medium=github&utm_source=unfold).
 - **Formula:** Repository with demo implementation at [github.com/unfoldadmin/formula](https://github.com/unfoldadmin/formula?utm_medium=github&utm_source=unfold).
 - **Turbo:** Django & Next.js boilerplate implementing Unfold at [github.com/unfoldadmin/turbo](https://github.com/unfoldadmin/turbo?utm_medium=github&utm_source=unfold).
+- **Discord:** Join the Unfold community on [Discord](https://discord.gg/9sQj9MEbNz).
+
+
 
 ## Are you using Unfold and need help?
 
@@ -32,6 +35,7 @@ Have you decided to start using Unfold but don’t have time to make the switch
 - **Inline tabs:** Groups inlines into tab navigation in the change form.
 - **Model tabs:** Allows defining custom tab navigation for models.
 - **Fieldset tabs:** Merges multiple fieldsets into tabs in the change form.
+- **Sortable inlines:** Allows sorting inlines by dragging and dropping.
 - **Environment label**: Distinguishes between environments by displaying a label.
 - **Nonrelated inlines**: Displays nonrelated models as inlines in the change form.
 - **Favicons**: Built-in support for configuring various site favicons.

{django_unfold-0.40.0 → django_unfold-0.42.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "django-unfold"
-version = "0.40.0"
+version = "0.42.0"
 description = "Modern Django admin theme for seamless interface development"
 license = "MIT"
 readme = "README.md"
@@ -16,6 +16,7 @@ classifiers = [
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
     "Operating System :: OS Independent",
     "Environment :: Web Environment",
     "Intended Audience :: Developers",
@@ -89,7 +90,7 @@ legacy_tox_ini = """
     [tox]
     isolated_build = true
     envlist =
-        python{38,39,310,311,312}-django{32,41,42,50,51}
+        python{38,39,310,311,312,313}-django{32,41,42,50,51}
 
     [testenv]
     skip_install = true

{django_unfold-0.40.0 → django_unfold-0.42.0}/src/unfold/admin.py

@@ -233,6 +233,7 @@ class ModelAdmin(ModelAdminMixin, BaseModelAdmin):
     add_fieldsets = ()
     list_horizontal_scrollbar_top = False
     list_filter_submit = False
+    list_filter_sheet = True
     list_fullwidth = False
     list_disable_select_all = False
     list_before_template = None
@@ -471,7 +472,12 @@ class ModelAdmin(ModelAdminMixin, BaseModelAdmin):
             for action in self.get_actions_row(request)
         ]
 
-        extra_context.update({"actions_list": actions, "actions_row": actions_row})
+        extra_context.update(
+            {
+                "actions_list": actions,
+                "actions_row": actions_row,
+            }
+        )
 
         return super().changelist_view(request, extra_context)
 
@@ -560,8 +566,12 @@ class ModelAdmin(ModelAdminMixin, BaseModelAdmin):
 class TabularInline(ModelAdminMixin, BaseTabularInline):
     formfield_overrides = FORMFIELD_OVERRIDES_INLINE
     readonly_preprocess_fields = {}
+    ordering_field = None
+    hide_ordering_field = False
 
 
 class StackedInline(ModelAdminMixin, BaseStackedInline):
     formfield_overrides = FORMFIELD_OVERRIDES_INLINE
     readonly_preprocess_fields = {}
+    ordering_field = None
+    hide_ordering_field = False

{django_unfold-0.40.0 → django_unfold-0.42.0}/src/unfold/contrib/filters/admin.py

@@ -16,9 +16,10 @@ from django.db.models.fields import (
 )
 from django.forms import ValidationError
 from django.http import HttpRequest
-from django.utils.dateparse import parse_datetime
 from django.utils.translation import gettext_lazy as _
 
+from unfold.utils import parse_date_str, parse_datetime_str
+
 from .forms import (
     DropdownForm,
     RangeDateForm,
@@ -468,25 +469,13 @@ class RangeDateFilter(admin.FieldListFilter):
     def queryset(self, request: HttpRequest, queryset: QuerySet) -> QuerySet:
         filters = {}
 
-        value_from = self.used_parameters.get(self.parameter_name + "_from", None)
+        value_from = self.used_parameters.get(self.parameter_name + "_from")
         if value_from not in EMPTY_VALUES:
-            filters.update(
-                {
-                    self.parameter_name + "__gte": self.used_parameters.get(
-                        self.parameter_name + "_from", None
-                    ),
-                }
-            )
+            filters.update({self.parameter_name + "__gte": parse_date_str(value_from)})
 
-        value_to = self.used_parameters.get(self.parameter_name + "_to", None)
+        value_to = self.used_parameters.get(self.parameter_name + "_to")
         if value_to not in EMPTY_VALUES:
-            filters.update(
-                {
-                    self.parameter_name + "__lte": self.used_parameters.get(
-                        self.parameter_name + "_to", None
-                    ),
-                }
-            )
+            filters.update({self.parameter_name + "__lte": parse_date_str(value_to)})
 
         try:
             return queryset.filter(**filters)
@@ -546,18 +535,22 @@ class RangeDateTimeFilter(admin.FieldListFilter):
 
         if self.parameter_name + "_from_0" in params:
             value = params.pop(self.field_path + "_from_0")
+            value = value[0] if isinstance(value, list) else value
             self.used_parameters[self.field_path + "_from_0"] = value
 
         if self.parameter_name + "_from_1" in params:
             value = params.pop(self.field_path + "_from_1")
+            value = value[0] if isinstance(value, list) else value
             self.used_parameters[self.field_path + "_from_1"] = value
 
         if self.parameter_name + "_to_0" in params:
             value = params.pop(self.field_path + "_to_0")
+            value = value[0] if isinstance(value, list) else value
             self.used_parameters[self.field_path + "_to_0"] = value
 
         if self.parameter_name + "_to_1" in params:
             value = params.pop(self.field_path + "_to_1")
+            value = value[0] if isinstance(value, list) else value
             self.used_parameters[self.field_path + "_to_1"] = value
 
     def expected_parameters(self) -> List[str]:
@@ -571,20 +564,17 @@ class RangeDateTimeFilter(admin.FieldListFilter):
     def queryset(self, request: HttpRequest, queryset: QuerySet) -> QuerySet:
         filters = {}
 
-        date_value_from = self.used_parameters.get(
-            self.parameter_name + "_from_0", None
-        )
-        time_value_from = self.used_parameters.get(
-            self.parameter_name + "_from_1", None
-        )
-        date_value_to = self.used_parameters.get(self.parameter_name + "_to_0", None)
-        time_value_to = self.used_parameters.get(self.parameter_name + "_to_1", None)
+        date_value_from = self.used_parameters.get(self.parameter_name + "_from_0")
+        time_value_from = self.used_parameters.get(self.parameter_name + "_from_1")
+
+        date_value_to = self.used_parameters.get(self.parameter_name + "_to_0")
+        time_value_to = self.used_parameters.get(self.parameter_name + "_to_1")
 
         if date_value_from not in EMPTY_VALUES and time_value_from not in EMPTY_VALUES:
             filters.update(
                 {
-                    f"{self.parameter_name}__gte": parse_datetime(
-                        f"{date_value_from}T{time_value_from}"
+                    f"{self.parameter_name}__gte": parse_datetime_str(
+                        f"{date_value_from} {time_value_from}"
                     ),
                 }
             )
@@ -592,8 +582,8 @@ class RangeDateTimeFilter(admin.FieldListFilter):
         if date_value_to not in EMPTY_VALUES and time_value_to not in EMPTY_VALUES:
             filters.update(
                 {
-                    f"{self.parameter_name}__lte": parse_datetime(
-                        f"{date_value_to}T{time_value_to}"
+                    f"{self.parameter_name}__lte": parse_datetime_str(
+                        f"{date_value_to} {time_value_to}"
                     ),
                 }
             )
@@ -612,16 +602,16 @@ class RangeDateTimeFilter(admin.FieldListFilter):
                     name=self.parameter_name,
                     data={
                         self.parameter_name + "_from_0": self.used_parameters.get(
-                            self.parameter_name + "_from_0", None
+                            self.parameter_name + "_from_0"
                         ),
                         self.parameter_name + "_from_1": self.used_parameters.get(
-                            self.parameter_name + "_from_1", None
+                            self.parameter_name + "_from_1"
                         ),
                         self.parameter_name + "_to_0": self.used_parameters.get(
-                            self.parameter_name + "_to_0", None
+                            self.parameter_name + "_to_0"
                         ),
                         self.parameter_name + "_to_1": self.used_parameters.get(
-                            self.parameter_name + "_to_1", None
+                            self.parameter_name + "_to_1"
                         ),
                     },
                 ),

{django_unfold-0.40.0 → django_unfold-0.42.0}/src/unfold/contrib/filters/forms.py

@@ -26,7 +26,7 @@ class DropdownForm(forms.Form):
     widget = UnfoldAdminSelectWidget(
         attrs={
             "data-theme": "admin-autocomplete",
-            "class": "admin-autocomplete",
+            "class": "unfold-admin-autocomplete admin-autocomplete",
         }
     )
     field = ChoiceField
@@ -38,7 +38,7 @@ class DropdownForm(forms.Form):
             self.widget = UnfoldAdminSelectMultipleWidget(
                 attrs={
                     "data-theme": "admin-autocomplete",
-                    "class": "admin-autocomplete",
+                    "class": "unfold-admin-autocomplete admin-autocomplete",
                 }
             )
             self.field = MultipleChoiceField

{django_unfold-0.40.0 → django_unfold-0.42.0}/src/unfold/contrib/forms/templates/unfold/forms/array.html

@@ -14,7 +14,7 @@
     {% endfor %}
 
     <template x-for="(item, index) in items" :key="item.key">
-        <div class="flex flex-row">
+        <div class="flex flex-row" x-init="if ($el.getElementsByTagName('input')[0].name.includes('__prefix__')) { $el.getElementsByTagName('input')[0].name = $el.parentElement.getElementsByTagName('input')[0].name }">
             {% with widget=template %}
                 {% include template.template_name %}
             {% endwith %}
@@ -26,7 +26,7 @@
     </template>
 
     <div class="flex flex-row">
-        <div x-on:click="items.push({ key: new Date().getTime()})" class="bg-primary-600 border border-transparent cursor-pointer font-medium inline-block px-3 py-2 rounded-md text-sm text-white w-full lg:w-auto">
+        <div x-on:click="items.push({ key: new Date().getTime()})" class="bg-primary-600 border border-transparent cursor-pointer font-medium inline-block px-3 py-2 rounded-md text-center text-sm text-white w-full lg:w-auto">
             {% trans "Add new item" %}
         </div>
     </div>

{django_unfold-0.40.0 → django_unfold-0.42.0}/src/unfold/contrib/guardian/templates/admin/guardian/model/obj_perms_manage.html

@@ -3,9 +3,9 @@
 {% load admin_urls i18n guardian_tags  %}
 
 {% block breadcrumbs %}{% if not is_popup %}
-    <div class="px-4 lg:px-12">
+    <div class="px-4 lg:px-8">
         <div class="container mb-6 mx-auto -my-3 lg:mb-12">
-            <ul class="flex">
+            <ul class="flex flex-wrap">
                 {% url 'admin:index' as link %}
                 {% trans 'Home' as name %}
                 {% include 'unfold/helpers/breadcrumb_item.html' with link=link name=name %}

{django_unfold-0.40.0 → django_unfold-0.42.0}/src/unfold/contrib/guardian/templates/admin/guardian/model/obj_perms_manage_group.html

@@ -6,9 +6,9 @@
 {% endblock %}
 
 {% block breadcrumbs %}{% if not is_popup %}
-    <div class="px-4 lg:px-12">
+    <div class="px-4 lg:px-8">
         <div class="container mb-6 mx-auto -my-3 lg:mb-12">
-            <ul class="flex">
+            <ul class="flex flex-wrap">
                 {% url 'admin:index' as link %}
                 {% trans 'Home' as name %}
                 {% include 'unfold/helpers/breadcrumb_item.html' with link=link name=name %}

{django_unfold-0.40.0 → django_unfold-0.42.0}/src/unfold/contrib/guardian/templates/admin/guardian/model/obj_perms_manage_user.html

@@ -7,9 +7,9 @@
 {% endblock %}
 
 {% block breadcrumbs %}{% if not is_popup %}
-    <div class="px-4 lg:px-12">
+    <div class="px-4 lg:px-8">
         <div class="container mb-6 mx-auto -my-3 lg:mb-12">
-            <ul class="flex">
+            <ul class="flex flex-wrap">
                 {% url 'admin:index' as link %}
                 {% trans 'Home' as name %}
                 {% include 'unfold/helpers/breadcrumb_item.html' with link=link name=name %}

{django_unfold-0.40.0 → django_unfold-0.42.0}/src/unfold/contrib/import_export/templates/admin/import_export/export.html

@@ -10,9 +10,9 @@
 {% endblock %}
 
 {% block breadcrumbs %}
-    <div class="px-4 lg:px-12">
+    <div class="px-4 lg:px-8">
         <div class="container mb-6 mx-auto -my-3 lg:mb-12">
-            <ul class="flex">
+            <ul class="flex flex-wrap">
                 {% url 'admin:index' as link %}
                 {% trans 'Home' as name %}
                 {% include 'unfold/helpers/breadcrumb_item.html' with link=link name=name %}

{django_unfold-0.40.0 → django_unfold-0.42.0}/src/unfold/contrib/import_export/templates/admin/import_export/import.html

@@ -21,9 +21,9 @@
 {% endblock %}
 
 {% block breadcrumbs %}
-    <div class="px-4 lg:px-12">
+    <div class="px-4 lg:px-8">
         <div class="container mb-6 mx-auto -my-3 lg:mb-12">
-            <ul class="flex">
+            <ul class="flex flex-wrap">
                 {% url 'admin:index' as link %}
                 {% trans 'Home' as name %}
                 {% include 'unfold/helpers/breadcrumb_item.html' with link=link name=name %}

{django_unfold-0.40.0 → django_unfold-0.42.0}/src/unfold/contrib/simple_history/templates/simple_history/object_history_form.html

@@ -4,9 +4,9 @@
 {% load url from simple_history_compat %}
 
 {% block breadcrumbs %}
-    <div class="px-4 lg:px-12">
+    <div class="px-4 lg:px-8">
         <div class="container mb-6 mx-auto -my-3 lg:mb-12">
-            <ul class="flex">
+            <ul class="flex flex-wrap">
                 {% url 'admin:index' as link %}
                 {% trans 'Home' as name %}
                 {% include 'unfold/helpers/breadcrumb_item.html' with link=link name=name %}

{django_unfold-0.40.0 → django_unfold-0.42.0}/src/unfold/contrib/simple_history/templates/simple_history/submit_line.html

@@ -2,7 +2,7 @@
 
 <div {% if not is_popup %}id="submit-row"{% endif %} class="relative z-20 {% if not is_popup %} mt-20 lg:mt-8{% endif %}">
     <div class="{% if not is_popup %}bottom-0 fixed left-0 right-0{% endif %}" {% if not is_popup %}x-bind:class="{'xl:left-0': !sidebarDesktopOpen, 'xl:left-72': sidebarDesktopOpen}"{% endif %}>
-        <div class="bg-white dark:bg-gray-900 {% if not is_popup %}border-t px-4 py-4 relative scrollable-top lg:px-12 dark:border-gray-800{% endif %}">
+        <div class="bg-white dark:bg-gray-900 {% if not is_popup %}border-t px-4 py-4 relative scrollable-top lg:px-8 dark:border-gray-800{% endif %}">
             <div class="container flex flex-col-reverse gap-3 items-center mx-auto lg:flex-row-reverse">
                 {% if not revert_disabled %}
                     <button type="submit" class="bg-primary-600 block border border-transparent font-medium px-3 py-2 rounded-md text-sm text-white w-full lg:w-auto"  name="_save" {{ onclick_attrib }}>

{django_unfold-0.40.0 → django_unfold-0.42.0}/src/unfold/settings.py

@@ -12,6 +12,7 @@ CONFIG_DEFAULTS = {
     "SITE_FAVICONS": [],
     "SHOW_HISTORY": True,
     "SHOW_VIEW_ON_SITE": True,
+    "SHOW_LANGUAGES": False,
     "COLORS": {
         "font": {
             "subtle-light": "107 114 128",  # text-gray-500

{django_unfold-0.40.0 → django_unfold-0.42.0}/src/unfold/sites.py

@@ -1,5 +1,6 @@
 from http import HTTPStatus
 from typing import Any, Callable, Dict, List, Optional, Union
+from urllib.parse import parse_qs, urlparse
 
 from django.contrib.admin import AdminSite
 from django.contrib.auth import REDIRECT_FIELD_NAME
@@ -84,6 +85,7 @@ class UnfoldAdminSite(AdminSite):
                 "show_view_on_site": get_config(self.settings_name)[
                     "SHOW_VIEW_ON_SITE"
                 ],
+                "show_languages": get_config(self.settings_name)["SHOW_LANGUAGES"],
                 "colors": self._process_colors(
                     get_config(self.settings_name)["COLORS"]
                 ),
@@ -234,6 +236,7 @@ class UnfoldAdminSite(AdminSite):
 
     def get_sidebar_list(self, request: HttpRequest) -> List[Dict[str, Any]]:
         navigation = get_config(self.settings_name)["SIDEBAR"].get("navigation", [])
+        tabs = get_config(self.settings_name)["TABS"]
         results = []
 
         for group in navigation:
@@ -245,7 +248,8 @@ class UnfoldAdminSite(AdminSite):
                     request, item.get("link_callback") or item["link"]
                 )
 
-                for tab in get_config(self.settings_name)["TABS"]:
+                # Checks if any tab item is active and then marks the sidebar link as active
+                for tab in tabs:
                     has_primary_link = False
                     has_tab_link_active = False
 
@@ -302,7 +306,7 @@ class UnfoldAdminSite(AdminSite):
                     item["link_callback"] = lazy(item["link"])(request)
 
                 item["active"] = self._get_is_active(
-                    request, item.get("link_callback") or item["link"]
+                    request, item.get("link_callback") or item["link"], True
                 )
                 allowed_items.append(item)
 
@@ -391,13 +395,29 @@ class UnfoldAdminSite(AdminSite):
 
         return colors
 
-    def _get_is_active(self, request: HttpRequest, link: str) -> bool:
+    def _get_is_active(
+        self, request: HttpRequest, link: str, is_tab: bool = False
+    ) -> bool:
         if not isinstance(link, str):
             link = str(link)
 
-        if link in request.path and link != reverse_lazy(f"{self.name}:index"):
+        index_path = reverse_lazy(f"{self.name}:index")
+        link_path = urlparse(link).path
+
+        # Dashboard
+        if link_path == request.path == index_path:
             return True
-        elif link == request.path == reverse_lazy(f"{self.name}:index"):
+
+        if link_path in request.path and link_path != index_path:
+            query_params = parse_qs(urlparse(link).query)
+            request_params = parse_qs(request.GET.urlencode())
+
+            # In case of tabs, we need to check if the query params are the same
+            if is_tab and not all(
+                request_params.get(k) == v for k, v in query_params.items()
+            ):
+                return False
+
             return True
 
         return False