django-unfold 0.48.0__py3-none-any.whl → 0.49.1__py3-none-any.whl

{django_unfold-0.48.0.dist-info → django_unfold-0.49.1.dist-info}/METADATA

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

{django_unfold-0.48.0.dist-info → django_unfold-0.49.1.dist-info}/RECORD

@@ -1,5 +1,5 @@
 unfold/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-unfold/admin.py,sha256=kIMEWKwiqnBo5eEDa_sBUlHh1XsZUhCt-Ct9bQ_H9vg,20018
+unfold/admin.py,sha256=JOT4AbbCcGKDi_Qwi_yuFngkLbo78SHd-aHiHNLaI8M,6093
 unfold/apps.py,sha256=SlBXPYrUd2uXn67qFbRvbXSUk3XFWrF4-5WELgDCvho,381
 unfold/checks.py,sha256=8I3i4xR_KgyJdpQyZUZzKNeyYf-sNzg6PAlsREuMfgI,1664
 unfold/components.py,sha256=vqkQzseYUvLXDohmTVAlbKopALjyX4WA9yglvdfhqu4,1283
@@ -72,21 +72,25 @@ unfold/contrib/simple_history/templates/simple_history/object_history.html,sha25
 unfold/contrib/simple_history/templates/simple_history/object_history_form.html,sha256=JKCe-QTBZMB2ol5LPiX3gNuNxFpi_rqlXC9X92PFBPE,2296
 unfold/contrib/simple_history/templates/simple_history/object_history_list.html,sha256=ls_xEAAgGzbu0IXdjZk7scEyEJx0S7i3Khr9ND98gzY,6842
 unfold/contrib/simple_history/templates/simple_history/submit_line.html,sha256=y8BleGHPNztA_R37rTB-zjJ68uDbE8flYSvMD0Jfl5Y,1734
-unfold/dataclasses.py,sha256=41LuzojpU1NehkpbPP4FaJwMTXZtwb6jKNhc0iLQlqY,587
-unfold/decorators.py,sha256=7VNVSz3KoaMwCRAcBGO18wURXozXWrf_B0qPQity46c,3359
+unfold/dataclasses.py,sha256=p3sqaIRfmGYEMq_-cSQIRYdsTeuqgiJ4ge_neQQrpd4,618
+unfold/decorators.py,sha256=xofDxfJhVSmeyTh3fXiCXZtUKliuJOlxCQVQg3f1Fss,3740
 unfold/exceptions.py,sha256=gcCj1ox61E137bk_0Cqy4YC3SttdPgB-fiJUqpmyHSE,43
-unfold/fields.py,sha256=yhtpDfqycpOxqdQlbncCg9qhELxGk3AtXizkZyzzH0g,7410
+unfold/fields.py,sha256=J3goIMlP_XOmQ85Xgh2v5MylXSP1o5I7o9_So2FQn2k,7461
 unfold/forms.py,sha256=BKv7eCbv29eCIuf1d_ZBmD4-_OIIzRaopiFd2nKbXNY,4520
+unfold/mixins/__init__.py,sha256=YlhoDs9Y_DXQ8Ejr3enxuHMS1-Ij9fwukxNwpeOS4Co,190
+unfold/mixins/action_model_admin.py,sha256=FI326hzuGzoPBvQrl9UF-mGcczMhJJaW5Qcb43_hH8I,11803
+unfold/mixins/base_model_admin.py,sha256=PR4eqU48yB4CNy9Bjd7fjxbOFiFpZM4etYmBOSaRX_M,4140
+unfold/overrides.py,sha256=ERVY9boZiXgjDYcTEZcIp7KWoeBZ45VM_zN31yAOjyQ,2922
 unfold/settings.py,sha256=5gs0iewBoUUrsF9LHHqcGOhW1HnyfZWY_zXuATjJOzE,2671
-unfold/sites.py,sha256=EVGzu9GvMW6iwl22htt7OaPnXAzTNN4uAwLrj149X2I,15998
+unfold/sites.py,sha256=iwpJ9Qykxe0q4-alGE_07bJdBSpmIeTDxZil-C_vWSc,16054
 unfold/static/admin/js/admin/RelatedObjectLookups.js,sha256=alI0-yq7YPDJJJn-yg1ce79-Cv88yQDUrfaGqFZnsaY,9048
 unfold/static/admin/js/inlines.js,sha256=gxmQEUlJ9yasELjz9qpluogFZB-bD1KJfHs4PI7UjsA,14687
 unfold/static/unfold/css/simplebar.css,sha256=5LLaEM11pKi6JFCOLt4XKuZxTpT9rpdq_tNlaQytFlU,4647
-unfold/static/unfold/css/styles.css,sha256=2e50NohpwTJCkCq4h0lC17mpFLF3uwz-cKTxZCtF7G0,158571
-unfold/static/unfold/fonts/inter/Inter-Bold.woff2,sha256=O88EyjAeRPE_QEyKBKpK5wf2epUOEu8wwjj5bnhCZqE,46552
-unfold/static/unfold/fonts/inter/Inter-Medium.woff2,sha256=O88EyjAeRPE_QEyKBKpK5wf2epUOEu8wwjj5bnhCZqE,46552
-unfold/static/unfold/fonts/inter/Inter-Regular.woff2,sha256=O88EyjAeRPE_QEyKBKpK5wf2epUOEu8wwjj5bnhCZqE,46552
-unfold/static/unfold/fonts/inter/Inter-SemiBold.woff2,sha256=O88EyjAeRPE_QEyKBKpK5wf2epUOEu8wwjj5bnhCZqE,46552
+unfold/static/unfold/css/styles.css,sha256=ORq4t5sGDPl16B-05v-3ahusgoLVu9r6pH2kiYuNbPY,158172
+unfold/static/unfold/fonts/inter/Inter-Bold.woff2,sha256=-oiBJ7baAVtlVp8DUfO1w5GtkokElR8cIOn4RiqNleo,114840
+unfold/static/unfold/fonts/inter/Inter-Medium.woff2,sha256=D_PpRhThST61VjFP0keubEqFp3g7TMhr5TmUDPg_Kkg,114348
+unfold/static/unfold/fonts/inter/Inter-Regular.woff2,sha256=4G9rG8VTqupORmgCPtCrChRxKcMQf1Ebx9A9NhsK4IU,111268
+unfold/static/unfold/fonts/inter/Inter-SemiBold.woff2,sha256=XLcQPk5gWYmv68A9mJx5IB5UshtRg9szmB9w25F4owE,114812
 unfold/static/unfold/fonts/inter/styles.css,sha256=QqdgevXVfcD6vZGo8ciSkaEG_62_YcZg0hvHTNgJ56E,608
 unfold/static/unfold/fonts/material-symbols/Material-Symbols-Outlined.woff2,sha256=V6mmjk69Ee-coQvMsGV0tcNgV3E1nb7N9IKW8HVUBzk,256424
 unfold/static/unfold/fonts/material-symbols/styles.css,sha256=ZX1icA_BXCVL0eoY2H6XR8VT_Fxl_KnV6vFBm_OImHA,535
@@ -127,7 +131,7 @@ unfold/templates/admin/nav_sidebar.html,sha256=cadJwXcReRHwVTpXGycF3uv5VZ5JDcIbY
 unfold/templates/admin/object_history.html,sha256=bfad4_lfLQFcoMV67yW7BnAi1Hwrptmgxj2tgPYQjtI,4816
 unfold/templates/admin/pagination.html,sha256=1UIc6Hm2LnDDAHUE5UjuPzdFdiAat4tF6sk058UfRP0,2251
 unfold/templates/admin/search_form.html,sha256=eQkwq4OWVgNUSjZPzxAjtT4LcxUNcTSgDVKJ4lWwslQ,1447
-unfold/templates/admin/submit_line.html,sha256=5mxHoCVwMuocYW27P2YORmXduCNd251jTuJgHjxXvfo,4501
+unfold/templates/admin/submit_line.html,sha256=cN2bUfhNBz6OCdCeHqNYhXT2SD01YDwsQ-PVQaCGPPY,4782
 unfold/templates/auth/widgets/read_only_password_hash.html,sha256=bQiYKDKJkyVP0_2eJG16oKviB4WEA0V7lSp6sGfgows,751
 unfold/templates/registration/logged_out.html,sha256=GgLzqmOGpiw5FcA-Aw_T6YvhYHhGFWhyES40T28waLQ,1002
 unfold/templates/registration/password_change_done.html,sha256=9HDpSraz3Kxdy0Fghbn-Lv0GAtpPgG6cuO7fvfMiYg8,1077
@@ -148,7 +152,7 @@ unfold/templates/unfold/components/text.html,sha256=-GjxvdiaBQIaNfPSzT6SSIwnc3R2
 unfold/templates/unfold/components/title.html,sha256=aMYSO30ybFYqPnqwlJVh2uNmcgnVrRycZkHTjJTjpX8,171
 unfold/templates/unfold/components/tracker.html,sha256=-PvDHdAAB2G5mKXpQUtljWJYhhavsa1aEoBvLrCiCJo,284
 unfold/templates/unfold/helpers/account_links.html,sha256=8LBsa4uvwcbqc2kewHfSC8HaQAL3B-hPQIzV81rw_TU,1886
-unfold/templates/unfold/helpers/actions_row.html,sha256=0sz8i-dIDbCvmp-5JfMPZU3d_pfH43V7eXa4lIzF0EM,1977
+unfold/templates/unfold/helpers/actions_row.html,sha256=ZENvQJM2hGG3qvfwm-o9Ip665zXwqV-gl8VBof2WXgQ,2531
 unfold/templates/unfold/helpers/add_link.html,sha256=Z0TzUavXH8AQ7A-I0SQ79t-UI87dyP_PZEpsDrm13Q8,810
 unfold/templates/unfold/helpers/app_list.html,sha256=eIvBuP_g8oHvXZTy-IMjyynFCC1CChtMq4qZia6i77E,5751
 unfold/templates/unfold/helpers/app_list_default.html,sha256=74x9GIhXHp4J-qxfyS7siSaV8A4XlRwc_ivzvvKw_FY,3902
@@ -190,17 +194,17 @@ unfold/templates/unfold/helpers/messages/success.html,sha256=FVg3HNLW7i6VVZLqiUz
 unfold/templates/unfold/helpers/messages/warning.html,sha256=1bJj813EfxNSWcdQj6rM9bon4QTgMyrMydZY521h53E,149
 unfold/templates/unfold/helpers/messages.html,sha256=I9RIKfi4T65AG16-2s0C32RwbFkn0qLhdSqDfXpSbyE,915
 unfold/templates/unfold/helpers/navigation.html,sha256=HNr9bxZOg84zsbgORkOhJFXKSp0c2im438yiWCfonb0,787
-unfold/templates/unfold/helpers/navigation_header.html,sha256=NrRCeHo_vrEPj4y8YYju9J7hNCGoLYL0AVR77N2_Tk8,1328
+unfold/templates/unfold/helpers/navigation_header.html,sha256=upSSMGsqVzk_HfNINcapUtmR_d8kV2yxdwPEjMbRknY,1402
 unfold/templates/unfold/helpers/pagination_current_item.html,sha256=4cZ2KLVcP0Y7xuGyXgexDQ07r94cgM5Gnmtv11dkRPQ,69
 unfold/templates/unfold/helpers/pagination_ellipsis.html,sha256=8g0KUUKtqRkXx_EBLGtsJsiYQO4tPS3GazZjxT90e0M,56
 unfold/templates/unfold/helpers/search.html,sha256=w8Ute3qVfSIqUXzA3TKOx91RzW_qnffFi2Oe9qedtV4,1643
 unfold/templates/unfold/helpers/search_results.html,sha256=5gxOAfFBPOkRgDziyYio6ZXcDG1bzFw7t-KXGFaWrUk,653
 unfold/templates/unfold/helpers/site_branding.html,sha256=_pUyOvdjlV624eRq0wjpJkgXpn9DCDGc-0U6Mw0FupI,266
-unfold/templates/unfold/helpers/site_dropdown.html,sha256=2UrE2DA-sbgTEce97rP57WctAuB-1XGGJLWbUDy-xVY,869
-unfold/templates/unfold/helpers/site_icon.html,sha256=5Mr6VmLmKpGbgROlfJHVkaCes-K1i42ZhStdTFMfOEk,1207
+unfold/templates/unfold/helpers/site_dropdown.html,sha256=Zwg5ZGVIEHAI2h-YcWDDBz3QD2nYsP9m530wYArFk5I,878
+unfold/templates/unfold/helpers/site_icon.html,sha256=rB6oc6VBB0T7wtyGOPcrq6qepDRaA54F6-Wxtaru-ks,1297
 unfold/templates/unfold/helpers/site_logo.html,sha256=S_QJoT2qh0xw0ciaKxoT4GJ6QIH5eqgRSC0abbWWkOI,423
 unfold/templates/unfold/helpers/submit.html,sha256=4Mgf4lx7Atm8GPqD6LTJK3NA9zoSJjs9VPig7sDp8Ao,203
-unfold/templates/unfold/helpers/tab_action.html,sha256=l7TBZm5FjDjlJpTsYXFonLSFBDpN91jDiILY3hjjj5s,376
+unfold/templates/unfold/helpers/tab_action.html,sha256=qnMmPJOeMLAx64uTf1pdPq1OIKm1MQ2Et6vTU6WQb-8,2065
 unfold/templates/unfold/helpers/tab_list.html,sha256=ULuTZ7VaUFsgtqNr9eCb-A_Qmhp7gqt43V8sdu5fEII,5032
 unfold/templates/unfold/helpers/theme_switch.html,sha256=Kh3Q8RuBWCUuY8YJLwBwd5yKzDhK6y0Ggx_ERoGEGv8,2218
 unfold/templates/unfold/helpers/userlinks.html,sha256=oZqiwCxG_zRecAbzYrr8_hQvkndVB6-liP6LEZM1UZc,863
@@ -227,11 +231,11 @@ unfold/templates/unfold/widgets/url.html,sha256=IRLgW44VTKN7UrSWeywJwaxQhfG5jhhX
 unfold/templatetags/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 unfold/templatetags/unfold.py,sha256=C2x_fqjVCWku4WdyaD_u4UjXq9eue1CgnmEz5PCfrS8,12364
 unfold/templatetags/unfold_list.py,sha256=-KOU6Ib2k4gokuw_CgRooFCto8xJkiDyotbQbKAqkEY,14233
-unfold/typing.py,sha256=ZVeXbABOYjUFgtGlFLMh6jdiM9bHVCwxMW0pNtbvwuw,651
+unfold/typing.py,sha256=i7LM2LiwYTAjT5-OLDUPVn5b9X-DMmHnjlZG2toWwSE,692
 unfold/utils.py,sha256=L0oC9-j1B__BZ21M7i6rTXNbzCQaZ4T0qHYQcNupk0A,5480
 unfold/views.py,sha256=nqv-meiwGtCeET2r8WBVyijWnE94Dssc4QmdUVMMcEM,997
-unfold/widgets.py,sha256=ZsjOAlQgEGmllPvXfN5ApbtW3VFs51lJzW4V44v9Ilg,20172
-django_unfold-0.48.0.dist-info/LICENSE.md,sha256=Ltk_quRyyvV3J5v3brtOqmibeZSw2Hrb8bY1W3ya0Ik,1077
-django_unfold-0.48.0.dist-info/METADATA,sha256=Fw263kbNqMSQtyLw3NIplBzm6GyLISsCIE1HuojBADU,4840
-django_unfold-0.48.0.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
-django_unfold-0.48.0.dist-info/RECORD,,
+unfold/widgets.py,sha256=esW1wxdbZwUhF31ensitBF8_6kVq_Gp0_iDgv6F5Rr0,20246
+django_unfold-0.49.1.dist-info/LICENSE.md,sha256=Ltk_quRyyvV3J5v3brtOqmibeZSw2Hrb8bY1W3ya0Ik,1077
+django_unfold-0.49.1.dist-info/METADATA,sha256=TV-wBErjvceg-rCW_Qe4rP748lxMQJq2u2ggVrZmD6M,4840
+django_unfold-0.49.1.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
+django_unfold-0.49.1.dist-info/RECORD,,

unfold/admin.py

@@ -1,127 +1,33 @@
-import copy
 from functools import update_wrapper
-from typing import Any, Callable, Optional, Union
+from typing import Optional
 
 from django import forms
 from django.contrib.admin import ModelAdmin as BaseModelAdmin
 from django.contrib.admin import StackedInline as BaseStackedInline
 from django.contrib.admin import TabularInline as BaseTabularInline
 from django.contrib.admin import display, helpers
-from django.contrib.admin.widgets import RelatedFieldWidgetWrapper
-from django.db import models
 from django.db.models import BLANK_CHOICE_DASH, Model
-from django.db.models.fields import Field
-from django.db.models.fields.related import ForeignKey, ManyToManyField
-from django.forms import Form
-from django.forms.fields import TypedChoiceField
-from django.forms.models import ModelChoiceField, ModelMultipleChoiceField
-from django.forms.widgets import SelectMultiple
 from django.http import HttpRequest, HttpResponse
 from django.shortcuts import redirect
-from django.template.response import TemplateResponse
-from django.urls import URLPattern, path, reverse
+from django.urls import URLPattern, path
 from django.utils.safestring import mark_safe
 from django.utils.translation import gettext_lazy as _
 from django.views import View
 
-from .checks import UnfoldModelAdminChecks
-from .dataclasses import UnfoldAction
-from .exceptions import UnfoldException
-from .fields import UnfoldAdminField, UnfoldAdminReadonlyField
-from .forms import ActionForm
-from .typing import FieldsetsType
-from .widgets import (
-    SELECT_CLASSES,
-    UnfoldAdminBigIntegerFieldWidget,
-    UnfoldAdminDecimalFieldWidget,
-    UnfoldAdminEmailInputWidget,
-    UnfoldAdminFileFieldWidget,
-    UnfoldAdminImageFieldWidget,
-    UnfoldAdminImageSmallFieldWidget,
-    UnfoldAdminIntegerFieldWidget,
-    UnfoldAdminIntegerRangeWidget,
-    UnfoldAdminMoneyWidget,
-    UnfoldAdminNullBooleanSelectWidget,
-    UnfoldAdminRadioSelectWidget,
-    UnfoldAdminSelectWidget,
-    UnfoldAdminSingleDateWidget,
-    UnfoldAdminSingleTimeWidget,
-    UnfoldAdminSplitDateTimeWidget,
-    UnfoldAdminTextareaWidget,
-    UnfoldAdminTextInputWidget,
-    UnfoldAdminURLInputWidget,
-    UnfoldAdminUUIDInputWidget,
-    UnfoldBooleanSwitchWidget,
-    UnfoldBooleanWidget,
-    UnfoldForeignKeyRawIdWidget,
-)
-
-try:
-    from django.contrib.postgres.fields import ArrayField, IntegerRangeField
-    from django.contrib.postgres.search import SearchVectorField
-
-    HAS_PSYCOPG = True
-except ImportError:
-    HAS_PSYCOPG = False
-
-try:
-    from djmoney.models.fields import MoneyField
-
-    HAS_MONEY = True
-except ImportError:
-    HAS_MONEY = False
-
-FORMFIELD_OVERRIDES = {
-    models.DateTimeField: {
-        "form_class": forms.SplitDateTimeField,
-        "widget": UnfoldAdminSplitDateTimeWidget,
-    },
-    models.DateField: {"widget": UnfoldAdminSingleDateWidget},
-    models.TimeField: {"widget": UnfoldAdminSingleTimeWidget},
-    models.EmailField: {"widget": UnfoldAdminEmailInputWidget},
-    models.CharField: {"widget": UnfoldAdminTextInputWidget},
-    models.URLField: {"widget": UnfoldAdminURLInputWidget},
-    models.GenericIPAddressField: {"widget": UnfoldAdminTextInputWidget},
-    models.UUIDField: {"widget": UnfoldAdminUUIDInputWidget},
-    models.TextField: {"widget": UnfoldAdminTextareaWidget},
-    models.NullBooleanField: {"widget": UnfoldAdminNullBooleanSelectWidget},
-    models.BooleanField: {"widget": UnfoldBooleanSwitchWidget},
-    models.IntegerField: {"widget": UnfoldAdminIntegerFieldWidget},
-    models.BigIntegerField: {"widget": UnfoldAdminBigIntegerFieldWidget},
-    models.DecimalField: {"widget": UnfoldAdminDecimalFieldWidget},
-    models.FloatField: {"widget": UnfoldAdminDecimalFieldWidget},
-    models.FileField: {"widget": UnfoldAdminFileFieldWidget},
-    models.ImageField: {"widget": UnfoldAdminImageFieldWidget},
-    models.JSONField: {"widget": UnfoldAdminTextareaWidget},
-    models.DurationField: {"widget": UnfoldAdminTextInputWidget},
-}
-
-if HAS_PSYCOPG:
-    FORMFIELD_OVERRIDES.update(
-        {
-            ArrayField: {"widget": UnfoldAdminTextareaWidget},
-            SearchVectorField: {"widget": UnfoldAdminTextareaWidget},
-            IntegerRangeField: {"widget": UnfoldAdminIntegerRangeWidget},
-        }
-    )
-
-if HAS_MONEY:
-    FORMFIELD_OVERRIDES.update(
-        {
-            MoneyField: {"widget": UnfoldAdminMoneyWidget},
-        }
-    )
-
-FORMFIELD_OVERRIDES_INLINE = copy.deepcopy(FORMFIELD_OVERRIDES)
-
-FORMFIELD_OVERRIDES_INLINE.update(
-    {
-        models.ImageField: {"widget": UnfoldAdminImageSmallFieldWidget},
-    }
-)
+from unfold.checks import UnfoldModelAdminChecks
+from unfold.fields import UnfoldAdminField, UnfoldAdminReadonlyField
+from unfold.forms import ActionForm
+from unfold.mixins import ActionModelAdminMixin, BaseModelAdminMixin
+from unfold.overrides import FORMFIELD_OVERRIDES_INLINE
+from unfold.typing import FieldsetsType
+from unfold.widgets import UnfoldBooleanWidget
 
 checkbox = UnfoldBooleanWidget(
-    {"class": "action-select", "aria-label": _("Select record")}, lambda value: False
+    {
+        "class": "action-select",
+        "aria-label": _("Select record"),
+    },
+    lambda value: False,
 )
 
 helpers.AdminField = UnfoldAdminField
@@ -129,106 +35,8 @@ helpers.AdminField = UnfoldAdminField
 helpers.AdminReadonlyField = UnfoldAdminReadonlyField
 
 
-class ModelAdminMixin:
-    def __init__(self, model, admin_site):
-        overrides = copy.deepcopy(FORMFIELD_OVERRIDES)
-
-        for k, v in self.formfield_overrides.items():
-            overrides.setdefault(k, {}).update(v)
-
-        self.formfield_overrides = overrides
-
-        super().__init__(model, admin_site)
-
-    def formfield_for_choice_field(
-        self, db_field: Field, request: HttpRequest, **kwargs
-    ) -> TypedChoiceField:
-        if "widget" not in kwargs:
-            if db_field.name in self.radio_fields:
-                kwargs["widget"] = UnfoldAdminRadioSelectWidget(
-                    radio_style=self.radio_fields[db_field.name]
-                )
-            else:
-                kwargs["widget"] = UnfoldAdminSelectWidget()
-
-        if "choices" not in kwargs:
-            kwargs["choices"] = db_field.get_choices(
-                include_blank=db_field.blank, blank_choice=[("", _("Select value"))]
-            )
-
-        return super().formfield_for_choice_field(db_field, request, **kwargs)
-
-    def formfield_for_foreignkey(
-        self, db_field: ForeignKey, request: HttpRequest, **kwargs
-    ) -> Optional[ModelChoiceField]:
-        db = kwargs.get("using")
-
-        # Overrides widgets for all related fields
-        if "widget" not in kwargs:
-            if db_field.name in self.raw_id_fields:
-                kwargs["widget"] = UnfoldForeignKeyRawIdWidget(
-                    db_field.remote_field, self.admin_site, using=db
-                )
-            elif (
-                db_field.name not in self.get_autocomplete_fields(request)
-                and db_field.name not in self.radio_fields
-            ):
-                kwargs["widget"] = UnfoldAdminSelectWidget()
-                kwargs["empty_label"] = _("Select value")
-
-        return super().formfield_for_foreignkey(db_field, request, **kwargs)
-
-    def formfield_for_manytomany(
-        self,
-        db_field: ManyToManyField,
-        request: HttpRequest,
-        **kwargs,
-    ) -> ModelMultipleChoiceField:
-        if "widget" not in kwargs:
-            if db_field.name in self.raw_id_fields:
-                kwargs["widget"] = UnfoldAdminTextInputWidget()
-
-        form_field = super().formfield_for_manytomany(db_field, request, **kwargs)
-
-        # If M2M uses intermediary model, form_field will be None
-        if not form_field:
-            return None
-
-        if isinstance(form_field.widget, SelectMultiple):
-            form_field.widget.attrs["class"] = " ".join(SELECT_CLASSES)
-
-        return form_field
-
-    def formfield_for_nullboolean_field(
-        self, db_field: Field, request: HttpRequest, **kwargs
-    ) -> Optional[Field]:
-        if "widget" not in kwargs:
-            kwargs["widget"] = UnfoldAdminNullBooleanSelectWidget()
-
-        return db_field.formfield(**kwargs)
-
-    def formfield_for_dbfield(
-        self, db_field: Field, request: HttpRequest, **kwargs
-    ) -> Optional[Field]:
-        if isinstance(db_field, models.BooleanField) and db_field.null is True:
-            return self.formfield_for_nullboolean_field(db_field, request, **kwargs)
-
-        formfield = super().formfield_for_dbfield(db_field, request, **kwargs)
-
-        if formfield and isinstance(formfield.widget, RelatedFieldWidgetWrapper):
-            formfield.widget.template_name = (
-                "unfold/widgets/related_widget_wrapper.html"
-            )
-
-        return formfield
-
-
-class ModelAdmin(ModelAdminMixin, BaseModelAdmin):
+class ModelAdmin(BaseModelAdminMixin, ActionModelAdminMixin, BaseModelAdmin):
     action_form = ActionForm
-    actions_list = ()
-    actions_row = ()
-    actions_detail = ()
-    actions_submit_line = ()
     custom_urls = ()
     add_fieldsets = ()
     list_horizontal_scrollbar_top = False
@@ -269,86 +77,6 @@ class ModelAdmin(ModelAdminMixin, BaseModelAdmin):
             return self.add_fieldsets
         return super().get_fieldsets(request, obj)
 
-    def _filter_unfold_actions_by_permissions(
-        self,
-        request: HttpRequest,
-        actions: list[UnfoldAction],
-        object_id: Optional[Union[int, str]] = None,
-    ) -> list[UnfoldAction]:
-        """Filter out any Unfold actions that the user doesn't have access to."""
-        filtered_actions = []
-        for action in actions:
-            if not hasattr(action.method, "allowed_permissions"):
-                filtered_actions.append(action)
-                continue
-
-            permission_checks = (
-                getattr(self, f"has_{permission}_permission")
-                for permission in action.method.allowed_permissions
-            )
-
-            if object_id:
-                if any(
-                    has_permission(request, object_id)
-                    for has_permission in permission_checks
-                ):
-                    filtered_actions.append(action)
-            else:
-                if any(has_permission(request) for has_permission in permission_checks):
-                    filtered_actions.append(action)
-
-        return filtered_actions
-
-    def get_actions_list(self, request: HttpRequest) -> list[UnfoldAction]:
-        return self._filter_unfold_actions_by_permissions(
-            request, self._get_base_actions_list()
-        )
-
-    def _get_base_actions_list(self) -> list[UnfoldAction]:
-        """
-        Returns all available list global actions, prior to any filtering
-        """
-        return [self.get_unfold_action(action) for action in self.actions_list or []]
-
-    def get_actions_detail(
-        self, request: HttpRequest, object_id: int
-    ) -> list[UnfoldAction]:
-        return self._filter_unfold_actions_by_permissions(
-            request, self._get_base_actions_detail(), object_id
-        )
-
-    def _get_base_actions_detail(self) -> list[UnfoldAction]:
-        """
-        Returns all available detail actions, prior to any filtering
-        """
-        return [self.get_unfold_action(action) for action in self.actions_detail or []]
-
-    def get_actions_row(self, request: HttpRequest) -> list[UnfoldAction]:
-        return self._filter_unfold_actions_by_permissions(
-            request, self._get_base_actions_row()
-        )
-
-    def _get_base_actions_row(self) -> list[UnfoldAction]:
-        """
-        Returns all available row actions, prior to any filtering
-        """
-        return [self.get_unfold_action(action) for action in self.actions_row or []]
-
-    def get_actions_submit_line(
-        self, request: HttpRequest, object_id: int
-    ) -> list[UnfoldAction]:
-        return self._filter_unfold_actions_by_permissions(
-            request, self._get_base_actions_submit_line(), object_id
-        )
-
-    def _get_base_actions_submit_line(self) -> list[UnfoldAction]:
-        """
-        Returns all available submit row actions, prior to any filtering
-        """
-        return [
-            self.get_unfold_action(action) for action in self.actions_submit_line or []
-        ]
-
     def get_custom_urls(self) -> tuple[tuple[str, str, View], ...]:
         """
         Method to get custom views for ModelAdmin with their urls
@@ -416,129 +144,6 @@ class ModelAdmin(ModelAdminMixin, BaseModelAdmin):
             name=custom_url[1],
         )
 
-    def changeform_view(
-        self,
-        request: HttpRequest,
-        object_id: Optional[str] = None,
-        form_url: str = "",
-        extra_context: Optional[dict[str, bool]] = None,
-    ) -> Any:
-        if extra_context is None:
-            extra_context = {}
-
-        actions = []
-        if object_id:
-            for action in self.get_actions_detail(request, object_id):
-                actions.append(
-                    {
-                        "title": action.description,
-                        "attrs": action.method.attrs,
-                        "path": reverse(
-                            f"{self.admin_site.name}:{action.action_name}",
-                            args=(object_id,),
-                        ),
-                    }
-                )
-
-        extra_context.update(
-            {
-                "actions_submit_line": self.get_actions_submit_line(request, object_id),
-                "actions_detail": actions,
-            }
-        )
-
-        return super().changeform_view(request, object_id, form_url, extra_context)
-
-    def changelist_view(
-        self, request: HttpRequest, extra_context: Optional[dict[str, str]] = None
-    ) -> TemplateResponse:
-        if extra_context is None:
-            extra_context = {}
-
-        actions = [
-            {
-                "title": action.description,
-                "attrs": action.method.attrs,
-                "path": reverse(f"{self.admin_site.name}:{action.action_name}"),
-            }
-            for action in self.get_actions_list(request)
-        ]
-
-        actions_row = [
-            {
-                "title": action.description,
-                "attrs": action.method.attrs,
-                "raw_path": f"{self.admin_site.name}:{action.action_name}",
-            }
-            for action in self.get_actions_row(request)
-        ]
-
-        extra_context.update(
-            {
-                "actions_list": actions,
-                "actions_row": actions_row,
-            }
-        )
-
-        return super().changelist_view(request, extra_context)
-
-    def get_unfold_action(self, action: str) -> UnfoldAction:
-        """
-        Converts action name to UnfoldAction
-        :param action:
-        :return:
-        """
-        method = self._get_instance_method(action)
-
-        return UnfoldAction(
-            action_name=f"{self.model._meta.app_label}_{self.model._meta.model_name}_{action}",
-            method=method,
-            description=self._get_action_description(method, action),
-            path=self._get_action_url(method, action),
-            attrs=method.attrs if hasattr(method, "attrs") else None,
-        )
-
-    @staticmethod
-    def _get_action_url(func: Callable, name: str) -> str:
-        """
-        Returns action URL if it was specified in @action decorator.
-        If it was not, name of the action is returned.
-        :param func:
-        :param name:
-        :return:
-        """
-        return getattr(func, "url_path", name)
-
-    def save_model(
-        self, request: HttpRequest, obj: Model, form: Form, change: Any
-    ) -> None:
-        super().save_model(request, obj, form, change)
-
-        for action in self.get_actions_submit_line(request, obj.pk):
-            if action.action_name not in request.POST:
-                continue
-
-            action.method(request, obj)
-
-    def _get_instance_method(self, method_name: str) -> Callable:
-        """
-        Searches for method on self instance based on method_name and returns it if it exists.
-        If it does not exist or is not callable, it raises UnfoldException
-        :param method_name: Name of the method to search for
-        :return: method from self instance
-        """
-        try:
-            method = getattr(self, method_name)
-        except AttributeError as e:
-            raise UnfoldException(
-                f"Method {method_name} specified does not exist on current object"
-            ) from e
-
-        if not callable(method):
-            raise UnfoldException(f"{method_name} is not callable")
-
-        return method
-
     def get_action_choices(
         self, request: HttpRequest, default_choices=BLANK_CHOICE_DASH
     ):
@@ -564,14 +169,14 @@ class ModelAdmin(ModelAdminMixin, BaseModelAdmin):
         return res
 
 
-class TabularInline(ModelAdminMixin, BaseTabularInline):
+class TabularInline(BaseModelAdminMixin, BaseTabularInline):
     formfield_overrides = FORMFIELD_OVERRIDES_INLINE
     readonly_preprocess_fields = {}
     ordering_field = None
     hide_ordering_field = False
 
 
-class StackedInline(ModelAdminMixin, BaseStackedInline):
+class StackedInline(BaseModelAdminMixin, BaseStackedInline):
     formfield_overrides = FORMFIELD_OVERRIDES_INLINE
     readonly_preprocess_fields = {}
     ordering_field = None

unfold/dataclasses.py

@@ -12,6 +12,7 @@ class UnfoldAction:
     path: str
     attrs: Optional[dict] = None
     object_id: Optional[Union[int, str]] = None
+    icon: Optional[str] = None
 
 
 @dataclass

unfold/decorators.py

@@ -17,6 +17,7 @@ def action(
     description: Optional[str] = None,
     url_path: Optional[str] = None,
     attrs: Optional[dict[str, Any]] = None,
+    icon: Optional[str] = None,
 ) -> ActionFunction:
     def decorator(func: Callable) -> ActionFunction:
         def inner(
@@ -33,8 +34,14 @@ def action(
                 # Permissions methods have following syntax: has_<some>_permission(self, request, obj=None):
                 # But obj is not examined by default in django admin and it would also require additional
                 # fetch from database, therefore it is not supported yet
-                if not any(
+                has_object_argument = (
+                    func.__name__ in model_admin.actions_detail
+                    or func.__name__ in model_admin.actions_submit_line
+                )
+                if not all(
                     has_permission(request, kwargs.get("object_id"))
+                    if has_object_argument
+                    else has_permission(request)
                     for has_permission in permission_checks
                 ):
                     raise PermissionDenied
@@ -42,10 +49,16 @@ def action(
 
         if permissions is not None:
             inner.allowed_permissions = permissions
+
         if description is not None:
             inner.short_description = description
+
         if url_path is not None:
             inner.url_path = url_path
+
+        if icon is not None:
+            inner.icon = icon
+
         inner.attrs = attrs or {}
         return inner
 

unfold/fields.py

@@ -17,17 +17,18 @@ from django.utils.module_loading import import_string
 from django.utils.safestring import SafeText, mark_safe
 from django.utils.text import capfirst
 
-from .settings import get_config
-from .utils import display_for_field, prettify_json
-from .widgets import CHECKBOX_LABEL_CLASSES, LABEL_CLASSES
+from unfold.mixins import BaseModelAdminMixin
+from unfold.settings import get_config
+from unfold.utils import display_for_field, prettify_json
+from unfold.widgets import CHECKBOX_LABEL_CLASSES, LABEL_CLASSES
 
 
 class UnfoldAdminReadonlyField(helpers.AdminReadonlyField):
     def label_tag(self) -> SafeText:
-        from .admin import ModelAdmin, ModelAdminMixin
+        from .admin import ModelAdmin
 
         if not isinstance(self.model_admin, ModelAdmin) and not isinstance(
-            self.model_admin, ModelAdminMixin
+            self.model_admin, BaseModelAdminMixin
         ):
             return super().label_tag()
 

unfold/mixins/__init__.py

@@ -0,0 +1,4 @@
+from unfold.mixins.action_model_admin import ActionModelAdminMixin
+from unfold.mixins.base_model_admin import BaseModelAdminMixin
+
+__all__ = ["BaseModelAdminMixin", "ActionModelAdminMixin"]