django-smartbase-admin 1.0.19__py3-none-any.whl → 1.0.22__py3-none-any.whl

django_smartbase_admin/admin/widgets.py

@@ -12,7 +12,7 @@ from django.contrib.admin.widgets import (
 from django.contrib.auth.forms import ReadOnlyPasswordHashWidget
 from django.core.exceptions import ValidationError
 from django.template.loader import render_to_string
-from django.urls import reverse, NoReverseMatch
+from django.urls import reverse
 from django.utils.formats import get_format
 from django.utils.http import urlencode
 from django.utils.safestring import mark_safe
@@ -22,6 +22,7 @@ from filer.fields.file import AdminFileWidget as FilerAdminFileWidget
 from filer.fields.image import AdminImageWidget
 from filer.models import File
 
+from django_smartbase_admin.admin.site import sb_admin_site
 from django_smartbase_admin.engine.admin_base_view import (
     SBADMIN_PARENT_INSTANCE_PK_VAR,
     SBADMIN_PARENT_INSTANCE_LABEL_VAR,
@@ -36,6 +37,12 @@ from django_smartbase_admin.templatetags.sb_admin_tags import (
 )
 from django_smartbase_admin.utils import is_modal
 
+try:
+    # Django >= 5.0
+    from django.contrib.admin.exceptions import NotRegistered
+except ImportError:
+    from django.contrib.admin.sites import NotRegistered
+
 logger = logging.getLogger(__name__)
 
 
@@ -438,21 +445,25 @@ class SBAdminAutocompleteWidget(
         return context
 
     def add_related_buttons_urls(self, parsed_value, request, context):
-        related_model = self.model
-        app_label = related_model._meta.app_label
-        model_name = related_model._meta.model_name
-
         try:
-            if parsed_value and self.has_view_or_change_permission(request, self.model):
-                change_url = reverse(
-                    "sb_admin:{}_{}_change".format(app_label, model_name),
-                    args=(parsed_value,),
+            if hasattr(sb_admin_site, "get_model_admin"):
+                # Django >= 5.0
+                related_model_admin = sb_admin_site.get_model_admin(self.model)
+            else:
+                related_model_admin = sb_admin_site._registry.get(self.model)
+                if not related_model_admin:
+                    return
+            if parsed_value and related_model_admin.has_view_or_change_permission(
+                request, self.model
+            ):
+                context["widget"]["attrs"]["related_edit_url"] = (
+                    related_model_admin.get_detail_url(parsed_value)
+                )
+            if related_model_admin.has_add_permission(request, self.model):
+                context["widget"]["attrs"]["related_add_url"] = (
+                    related_model_admin.get_new_url(request)
                 )
-                context["widget"]["attrs"]["related_edit_url"] = change_url
-            if self.has_add_permission(request, self.model):
-                add_url = reverse("sb_admin:{}_{}_add".format(app_label, model_name))
-                context["widget"]["attrs"]["related_add_url"] = add_url
-        except NoReverseMatch:
+        except NotRegistered:
             pass
 
     def is_multiselect(self):

django_smartbase_admin/engine/dashboard.py

@@ -1,6 +1,5 @@
 from copy import copy
 from datetime import timedelta
-
 from django.core.cache import cache
 from django.db import models
 from django.db.models import QuerySet
@@ -553,25 +552,28 @@ class SBAdminDashboardChartWidgetByDate(SBAdminDashboardChartWidget):
                     self.date_annotate_field
                 )
             )
-            date_range_compare = date_range
-            if compare == self.CompareOptions.COMPARE_PREVIOUS:
-                period_length = (date_range_compare[1] - date_range_compare[0]).days + 1
-                date_range_compare[0] = date_range_compare[0] - timedelta(
-                    days=period_length
-                )
-                date_range_compare[1] = date_range_compare[1] - timedelta(
-                    days=period_length
-                )
-            if compare == self.CompareOptions.COMPARE_PREVIOUS_YOY:
-                date_range_compare[0] = date_range_compare[0].replace(
-                    year=date_range_compare[0].year - 1
-                )
-                date_range_compare[1] = date_range_compare[1].replace(
-                    year=date_range_compare[1].year - 1
-                )
-            request_data_modified_date_filter.request_get[self.date_annotate_field] = (
-                DateFilterWidget.get_value_from_date_or_range(date_range_compare)
-            )
+            if date_range[0] and date_range[1]:
+                date_range_compare = date_range
+                if compare == self.CompareOptions.COMPARE_PREVIOUS:
+                    period_length = (
+                        date_range_compare[1] - date_range_compare[0]
+                    ).days + 1
+                    date_range_compare[0] = date_range_compare[0] - timedelta(
+                        days=period_length
+                    )
+                    date_range_compare[1] = date_range_compare[1] - timedelta(
+                        days=period_length
+                    )
+                if compare == self.CompareOptions.COMPARE_PREVIOUS_YOY:
+                    date_range_compare[0] = date_range_compare[0].replace(
+                        year=date_range_compare[0].year - 1
+                    )
+                    date_range_compare[1] = date_range_compare[1].replace(
+                        year=date_range_compare[1].year - 1
+                    )
+                request_data_modified_date_filter.request_get[
+                    self.date_annotate_field
+                ] = DateFilterWidget.get_value_from_date_or_range(date_range_compare)
             queryset_with_modified_date = self.get_data_queryset(request_copy)
 
             sub_widget_data = {}

django_smartbase_admin/migrations/0006_alter_sbadminuserconfiguration_color_scheme.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.0.14 on 2025-08-04 06:22
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('django_smartbase_admin', '0005_sbadminuserconfiguration'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='sbadminuserconfiguration',
+            name='color_scheme',
+            field=models.CharField(choices=[('auto', 'System'), ('dark', 'Dark'), ('light', 'Light')], default='auto', max_length=255, verbose_name='Theme'),
+        ),
+    ]

django_smartbase_admin/models.py

@@ -1,25 +1,14 @@
 from django.conf import settings
 from django.db import models
-from django.utils.html import format_html
 from django.utils.translation import gettext_lazy as _
 
 from django_smartbase_admin.querysets import SBAdminListViewConfigurationQueryset
 
-AUTO_LABEL = _("System")
-DARK_LABEL = _("Dark")
-LIGHT_LABEL = _("Light")
-
 
 class ColorScheme(models.TextChoices):
-    AUTO = "auto", format_html(
-        f'<span class="flex gap-8"><svg class="w-20 h-20"><use href="#Translation"></use></svg><span>{AUTO_LABEL}</span></span>'
-    )
-    DARK = "dark", format_html(
-        f'<span class="flex gap-8"><svg class="w-20 h-20"><use href="#Moon"></use></svg><span>{DARK_LABEL}</span></span>'
-    )
-    LIGHT = "light", format_html(
-        f'<span class="flex gap-8"><svg class="w-20 h-20"><use href="#Sun-one"></use></svg><span>{LIGHT_LABEL}</span></span>'
-    )
+    AUTO = "auto", _("System")
+    DARK = "dark", _("Dark")
+    LIGHT = "light", _("Light")
 
 
 class SBAdminListViewConfiguration(models.Model):

django_smartbase_admin/static/sb_admin/dist/calendar_style.css

@@ -1 +1 @@
-:root{--fc-small-font-size:.75rem;--fc-border-color:var(--color-dark-200);--fc-today-bg-color:var(--color-primary-50);--fc-neutral-bg-color:var(--color-bg-elevated)}.fc-theme-standard th.fc-col-header-cell{background-color:var(--color-bg);padding:.5rem 1.5rem}.fc-theme-standard td.fc-daygrid-day{padding:.5rem}.fc table{font-size:.75rem;line-height:1.25rem}.fc .fc-col-header-cell-cushion{font-size:.875rem;font-weight:500;line-height:1.25rem;padding:0}.fc .fc-daygrid-day{height:9rem}.fc .fc-day-other{background-color:var(--color-bg)}.fc .fc-day-other .fc-daygrid-day-top{opacity:1}.fc .fc-day-other .fc-daygrid-day-top .fc-daygrid-day-number{color:var(--color-dark)}.fc .fc-day-other .fc-daygrid-day-events{opacity:.6}.fc .fc-daygrid-day-bottom:after,.fc .fc-daygrid-day-bottom:before,.fc .fc-daygrid-day-events:after,.fc .fc-daygrid-day-events:before,.fc .fc-daygrid-day-frame:after,.fc .fc-daygrid-day-frame:before,.fc .fc-daygrid-event-harness:after,.fc .fc-daygrid-event-harness:before{display:none}.fc .fc-daygrid-day-events,.fc .fc-daygrid-day-frame{display:flex;flex-direction:column;gap:.25rem}.fc .fc-daygrid-day-events{margin:0}.fc .fc-daygrid-day-top{flex-direction:row}.fc .fc-daygrid-day-number{align-items:center;color:var(--color-dark-900);display:flex;font-weight:600;height:1.5rem;justify-content:center;line-height:1;padding:.25rem;width:1.5rem}.fc .fc-day-today .fc-daygrid-day-number{background-color:var(--color-primary);border-radius:9999px;color:var(--color-light)}.fc .fc-daygrid-event{display:flex;gap:.25rem;margin:0!important}.fc .fc-daygrid-dot-event{border-color:var(--color-dark-200);border-radius:6px;border-width:1px;height:1.5rem;padding:0 .5rem}.fc .fc-daygrid-dot-event .fc-event-time{display:none}.fc .fc-daygrid-dot-event .fc-event-title{color:var(--color-dark-900);font-weight:400;line-height:1rem;text-overflow:ellipsis}.fc .fc-daygrid-event-dot{border-color:currentColor;border-radius:9999px;border-width:2px;box-sizing:border-box;flex-shrink:0;height:.75rem;margin:0;width:.75rem}.fc .fc-daygrid-day-bottom{font-size:.75rem;line-height:1.25rem;margin:0!important}.fc .fc-daygrid-more-link{margin:0;padding:0}.fc .fc-daygrid-more-link:hover{background:none}.fc .fc-daygrid-body-unbalanced .fc-daygrid-day-events{margin-bottom:0;min-height:4rem}.fc .fc-daygrid-day-bg{display:none}.fc .fc-popover{z-index:10}.fc .fc-popover .fc-popover-header{padding:.25rem}.fc .fc-popover .fc-popover-title{font-size:.875rem;line-height:1.25rem}.fc .fc-popover .fc-popover-body{display:flex;flex-direction:column;gap:.25rem;padding:.5rem}.fc .fc-scrollgrid{border-left-width:0}.fc .fc-scrollgrid-section>td,.fc .fc-scrollgrid-section>th{border:0}
+:root{--fc-small-font-size:.75rem;--fc-border-color:var(--color-dark-200);--fc-today-bg-color:var(--color-primary-50);--fc-neutral-bg-color:var(--color-bg);--fc-page-bg-color:var(--color-bg-elevated)}.fc-theme-standard th.fc-col-header-cell{background-color:var(--color-bg);padding:.5rem 1.5rem}.fc-theme-standard td.fc-daygrid-day{padding:.5rem}.fc table{font-size:.75rem;line-height:1.25rem}.fc .fc-col-header-cell-cushion{font-size:.875rem;font-weight:500;line-height:1.25rem;padding:0}.fc .fc-daygrid-day{height:9rem}.fc .fc-day-other{background-color:var(--color-bg)}.fc .fc-day-other .fc-daygrid-day-top{opacity:1}.fc .fc-day-other .fc-daygrid-day-top .fc-daygrid-day-number{color:var(--color-dark)}.fc .fc-day-other .fc-daygrid-day-events{opacity:.6}.fc .fc-daygrid-day-bottom:after,.fc .fc-daygrid-day-bottom:before,.fc .fc-daygrid-day-events:after,.fc .fc-daygrid-day-events:before,.fc .fc-daygrid-day-frame:after,.fc .fc-daygrid-day-frame:before,.fc .fc-daygrid-event-harness:after,.fc .fc-daygrid-event-harness:before{display:none}.fc .fc-daygrid-day-events,.fc .fc-daygrid-day-frame{display:flex;flex-direction:column;gap:.25rem}.fc .fc-daygrid-day-events{margin:0}.fc .fc-daygrid-day-top{flex-direction:row}.fc .fc-daygrid-day-number{align-items:center;color:var(--color-dark-900);display:flex;font-weight:600;height:1.5rem;justify-content:center;line-height:1;padding:.25rem;width:1.5rem}.fc .fc-day-today .fc-daygrid-day-number{background-color:var(--color-primary);border-radius:9999px;color:var(--color-light)}.fc .fc-day-today.fc-day-other .fc-daygrid-day-top .fc-daygrid-day-number{color:var(--color-light)}.fc .fc-daygrid-event{display:flex;gap:.25rem;margin:0!important}.fc .fc-daygrid-dot-event{border-color:var(--color-dark-200);border-radius:6px;border-width:1px;height:1.5rem;padding:0 .5rem}.fc .fc-daygrid-dot-event .fc-event-time{display:none}.fc .fc-daygrid-dot-event .fc-event-title{color:var(--color-dark-900);font-weight:400;line-height:1rem;text-overflow:ellipsis}.fc .fc-daygrid-dot-event.event-positive{background-color:var(--color-success-50);border-color:var(--color-success-200)}.fc .fc-daygrid-dot-event.event-positive .fc-daygrid-event-dot{border-color:var(--color-success)}.fc .fc-daygrid-dot-event.event-warning{background-color:var(--color-warning-50);border-color:var(--color-warning-200)}.fc .fc-daygrid-dot-event.event-warning .fc-daygrid-event-dot{border-color:var(--color-warning)}.fc .fc-daygrid-dot-event.event-negative{background-color:var(--color-negative-50);border-color:var(--color-negative-200)}.fc .fc-daygrid-dot-event.event-negative .fc-daygrid-event-dot{border-color:var(--color-negative)}.fc .fc-daygrid-dot-event.event-notice{background-color:var(--color-notice-50);border-color:var(--color-notice-200)}.fc .fc-daygrid-dot-event.event-notice .fc-daygrid-event-dot{border-color:var(--color-notice)}.fc .fc-daygrid-event-dot{border-color:currentColor;border-radius:9999px;border-width:2px;box-sizing:border-box;flex-shrink:0;height:.75rem;margin:0;width:.75rem}.fc .fc-daygrid-day-bottom{font-size:.75rem;line-height:1.25rem;margin:0!important}.fc .fc-daygrid-more-link{margin:0;padding:0}.fc .fc-daygrid-more-link:hover{background:none}.fc .fc-daygrid-body-unbalanced .fc-daygrid-day-events{margin-bottom:0;min-height:4rem}.fc .fc-daygrid-day-bg{display:none}.fc .fc-popover{z-index:10}.fc .fc-popover .fc-popover-header{padding:.25rem}.fc .fc-popover .fc-popover-title{font-size:.875rem;line-height:1.25rem}.fc .fc-popover .fc-popover-body{display:flex;flex-direction:column;gap:.25rem;padding:.5rem}.fc .fc-scrollgrid{border-left-width:0}.fc .fc-scrollgrid-section>td,.fc .fc-scrollgrid-section>th{border:0}