django-smartbase-admin 1.0.3__py3-none-any.whl → 1.0.5__py3-none-any.whl

django_smartbase_admin/admin/widgets.py

@@ -205,9 +205,7 @@ class SBAdminDateWidget(SBAdminBaseWidget, forms.DateInput):
                 "flatpickrOptions": {
                     "dateFormat": "Y-m-d",
                     "altInput": True,
-                    "altFormat": get_format(
-                        "SHORT_DATE_FORMAT", use_l10n=settings.USE_L10N
-                    ),
+                    "altFormat": get_format("SHORT_DATE_FORMAT"),
                 },
             },
             cls=SBAdminJSONEncoder,

django_smartbase_admin/engine/actions.py

@@ -22,6 +22,8 @@ class SBAdminCustomAction(object):
         no_params=False,
         open_in_modal=False,
         group=None,
+        sub_actions=None,
+        icon=None,
     ) -> None:
         super().__init__()
         self.title = title
@@ -33,9 +35,15 @@ class SBAdminCustomAction(object):
         self.no_params = no_params
         self.open_in_modal = open_in_modal
         self.group = group
+        self.sub_actions = sub_actions
+        self.icon = icon
         self.resolve_url()
 
     def resolve_url(self):
+        if self.sub_actions:
+            for sub_action in self.sub_actions:
+                sub_action.resolve_url()
+            return
         if not (self.url or (self.view and self.action_id)):
             raise ImproperlyConfigured(
                 "You must provide either url or view and action_id"

django_smartbase_admin/engine/field.py

@@ -1,5 +1,13 @@
 from django.core.exceptions import FieldDoesNotExist, FieldError, ImproperlyConfigured
-from django.db.models import Count, Value, CharField, F, DateTimeField, BooleanField
+from django.db.models import (
+    Count,
+    Value,
+    CharField,
+    F,
+    DateTimeField,
+    BooleanField,
+    FilteredRelation,
+)
 from django.db.models.functions import Concat
 
 from django_smartbase_admin.engine.const import ANNOTATE_KEY, Formatter
@@ -268,5 +276,11 @@ class SBAdminField(JSONSerializableMixin):
             else:
                 field_annotates[self.field] = Value(None, output_field=CharField())
         if self.supporting_annotates:
-            supporting_annotates.update(self.supporting_annotates)
+            for key, value in self.supporting_annotates.items():
+                # workaround for a django bug
+                # https://code.djangoproject.com/ticket/36442#ticket
+                if isinstance(value, FilteredRelation):
+                    supporting_annotates[key] = value.clone()
+                else:
+                    supporting_annotates[key] = value
         return {**supporting_annotates, **field_annotates}

django_smartbase_admin/monkeypatch/fake_inline_monkeypatch.py

@@ -14,7 +14,7 @@ def monkeypatch_get_foreign_key(fnc):
             result = models.ForeignKey(
                 model.original_model, on_delete=models.DO_NOTHING
             )
-            result.name = SBAdminFakeInlineMixin.fk_name
+            result.set_attributes_from_name(SBAdminFakeInlineMixin.fk_name)
 
         return result