django-smartbase-admin 1.0.2__py3-none-any.whl → 1.0.4b1__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/fake_inline.py

@@ -77,6 +77,9 @@ class SBAdminFakeInlineMixin:
 
     def get_formset(self, request, obj=None, **kwargs):
         formset = super().get_formset(request, obj, **kwargs)
+        fake_fk = models.ForeignKey(self.original_model, on_delete=models.SET_NULL)
+        fake_fk.set_attributes_from_name("inline_fake_relationship")
+        formset.fk = fake_fk
         formset.queryset = self.get_queryset(request)
         formset.original_model = self.original_model
         formset.inline_instance = self

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/templates/sb_admin/sb_admin_base_no_sidebar.html

@@ -11,14 +11,14 @@
     <title>{% block title %}SBAdmin{% endblock %}</title>
 
     {% block icons %}
-        <link rel="apple-touch-icon" sizes="180x180" href="{% static 'favicon/apple-touch-icon.png' %}">
-        <link rel="icon" type="image/png" sizes="32x32" href="{% static 'favicon/favicon-32x32.png' %}">
-        <link rel="icon" type="image/png" sizes="16x16" href="{% static 'favicon/favicon-16x16.png' %}">
-        <link rel="manifest" href="{% static 'favicon/site.webmanifest' %}">
-        <link rel="mask-icon" href="{% static 'favicon/safari-pinned-tab.svg' %}" color="#e0004d">
-        <link rel="shortcut icon" href="{% static 'favicon/favicon.ico' %}">
+        <link rel="apple-touch-icon" sizes="180x180" href="{% static 'sb_admin/favicon/apple-touch-icon.png' %}">
+        <link rel="icon" type="image/png" sizes="32x32" href="{% static 'sb_admin/favicon/favicon-32x32.png' %}">
+        <link rel="icon" type="image/png" sizes="16x16" href="{% static 'sb_admin/favicon/favicon-16x16.png' %}">
+        <link rel="manifest" href="{% static 'sb_admin/favicon/site.webmanifest' %}">
+        <link rel="mask-icon" href="{% static 'sb_admin/favicon/safari-pinned-tab.svg' %}" color="#e0004d">
+        <link rel="shortcut icon" href="{% static 'sb_admin/favicon/favicon.ico' %}">
         <meta name="msapplication-TileColor" content="#e0004d">
-        <meta name="msapplication-config" content="{% static 'favicon/browserconfig.xml' %}">
+        <meta name="msapplication-config" content="{% static 'sb_admin/favicon/browserconfig.xml' %}">
         <meta name="theme-color" content="#ffffff">
     {% endblock %}
     <link rel="stylesheet" href="{% static 'sb_admin/dist/main_style.css' %}">

{django_smartbase_admin-1.0.2.dist-info → django_smartbase_admin-1.0.4b1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: django-smartbase-admin
-Version: 1.0.2
+Version: 1.0.4b1
 Summary: 
 Author: SmartBase
 Author-email: info@smartbase.sk

{django_smartbase_admin-1.0.2.dist-info → django_smartbase_admin-1.0.4b1.dist-info}/RECORD

@@ -5,7 +5,7 @@ django_smartbase_admin/actions/advanced_filters.py,sha256=Vm8b6TAwNehR8INjolFG7p
 django_smartbase_admin/admin/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 django_smartbase_admin/admin/admin_base.py,sha256=Dnql1LQVeJWla3ItuHbVgakUXT3apUfWvWc9MmundsQ,41765
 django_smartbase_admin/admin/site.py,sha256=VrJBhwgZsLa2GohvjnNL7m4dVR3S4Ou1V1UzfE1qOoQ,6577
-django_smartbase_admin/admin/widgets.py,sha256=LRrjZC79xfPWQOxwH3aGQB6s8UTvyqFGCXpH9vUwNKw,22730
+django_smartbase_admin/admin/widgets.py,sha256=rACFas2qt4-uWnQHQnsAMy-0sT5tsGzxRyyeWXWawM4,22656
 django_smartbase_admin/apps.py,sha256=C1wT1YUEZNKcUJfpD01nIZEFgYEsuav52WFKvEURRDU,545
 django_smartbase_admin/compilemessages.py,sha256=-_FEFQlOvE4L8UzSuUxSxZQjgGlwL9IZtmg59fW_kIQ,342
 django_smartbase_admin/engine/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -16,8 +16,8 @@ django_smartbase_admin/engine/admin_view.py,sha256=9wGffahDR3IYmhL9ZbX8uitwGdXdw
 django_smartbase_admin/engine/configuration.py,sha256=P3iSiPm9QBl9etTDJIWzo7DzOBCryGwWtbF288PEtus,8120
 django_smartbase_admin/engine/const.py,sha256=0-MZFCce8UnTHaL6tkezMXUf4S2ZoSc5HRGi-T7KcHU,2479
 django_smartbase_admin/engine/dashboard.py,sha256=wrvX0GI-SII2pG0DX8Kvy4JFaM6h8e6R7KSCFddFC64,23642
-django_smartbase_admin/engine/fake_inline.py,sha256=9C2_mltg2P9-xa3vuoo5X_RcFaCRpKGNSy7t1_iiasE,5802
-django_smartbase_admin/engine/field.py,sha256=CzQN_9mYTsnJ6B1HebrGCWLx3RLUZsGmzRuCa1v0fu4,10173
+django_smartbase_admin/engine/fake_inline.py,sha256=mTnohS1E2rPJSwDupQwzylSxA3bAGeV0hbRrsppWGjQ,5984
+django_smartbase_admin/engine/field.py,sha256=9yZfrc1UGqXoHhhBy08yLSjQB5ptfn9B-FQUDCcWtNc,10531
 django_smartbase_admin/engine/field_formatter.py,sha256=Ma4GoO2DMgCtx-zy_hgyW_095GWwflMdn8uN4GUatgw,2087
 django_smartbase_admin/engine/filter_widgets.py,sha256=mrygiz55wyJzZZUx3QlbVHb4IQrt5YpYcWkWf9JFN5M,31124
 django_smartbase_admin/engine/global_filter_form.py,sha256=jlj6e9VYWDPyUNjcgj3gTIkCZXO01NZOWAeU3jFtkoA,249
@@ -622,7 +622,7 @@ django_smartbase_admin/templates/sb_admin/partials/messages/alert_warning.html,s
 django_smartbase_admin/templates/sb_admin/partials/modal/modal.html,sha256=SaJkpGaEa_hSSmfL4yqrXfMOf3rvNsF6G2vOX6ngpJw,1508
 django_smartbase_admin/templates/sb_admin/partials/modal/modal_content.html,sha256=_1wrb2GsCvtwQPDl5CUVRgFdcsor25ceHi8UDsPAWt8,3251
 django_smartbase_admin/templates/sb_admin/sb_admin_base.html,sha256=wVwA5Gv9c_M6rRXIWglu9jFaEwC0NCprniYuaHO19qA,741
-django_smartbase_admin/templates/sb_admin/sb_admin_base_no_sidebar.html,sha256=-8NTw-o33FPoJxkyPB12OdRemDLXjwDbhgWHSe009DA,4177
+django_smartbase_admin/templates/sb_admin/sb_admin_base_no_sidebar.html,sha256=1lwpPQBxyLw3sn-W6h3ugjnsVsZ2kBck-ztfOFDb-6Q,4240
 django_smartbase_admin/templates/sb_admin/sb_admin_js_trans.html,sha256=9oSkJo6Ngwr5T8zkpn6GLcdXNTMa1A7SmgjTlg9jlzY,926
 django_smartbase_admin/templates/sb_admin/sprites/sb_admin.svg,sha256=CIjRhZaa7k4WJestFSDIUYWN4FWyeCQe_ahw5-N-vK8,60715
 django_smartbase_admin/templates/sb_admin/submit_line.html,sha256=cslitlZCL2UlRI8fyEftpSHoVTAX2eqC-oVkfulxZWU,3254
@@ -681,7 +681,7 @@ django_smartbase_admin/views/dashboard_view.py,sha256=vtz5emYTQ5WDFeLA8HrcmjSOVd
 django_smartbase_admin/views/global_filter_view.py,sha256=eYo1moJGyi7jc2cPDA5ZBiEgA7Hmc-DxbQvbqUpDkg8,1127
 django_smartbase_admin/views/media_view.py,sha256=5BLWXuzynF7nM34t-mf2BQSRN5ojY8HxpLIqt7Jiq9g,292
 django_smartbase_admin/views/translations_view.py,sha256=tkShf5IWyPDjNhcPQsvh8WXs-EMRCfG_oTD9x-LP1No,20272
-django_smartbase_admin-1.0.2.dist-info/LICENSE.md,sha256=okRGMBOYvyhprt2eTpX_QXqpzC0MODF-U7zX-4fKPjQ,1078
-django_smartbase_admin-1.0.2.dist-info/METADATA,sha256=TIDTwzqP5D6cGUY4x-RKI1Mu8FkJjK6eH2zgdCoCnes,4807
-django_smartbase_admin-1.0.2.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-django_smartbase_admin-1.0.2.dist-info/RECORD,,
+django_smartbase_admin-1.0.4b1.dist-info/LICENSE.md,sha256=okRGMBOYvyhprt2eTpX_QXqpzC0MODF-U7zX-4fKPjQ,1078
+django_smartbase_admin-1.0.4b1.dist-info/METADATA,sha256=wHSXnvxrqrENYi4x31-Ou5fzBiHrNeI0LyCSt5rsLHQ,4809
+django_smartbase_admin-1.0.4b1.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+django_smartbase_admin-1.0.4b1.dist-info/RECORD,,