django-smartbase-admin 2.3.4__tar.gz → 2.3.5__tar.gz

{django_smartbase_admin-2.3.4 → django_smartbase_admin-2.3.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: django-smartbase-admin
-Version: 2.3.4
+Version: 2.3.5
 Summary: 
 Home-page: https://smartbase-sk.github.io/django-smartbase-admin-docs/
 License: MIT

{django_smartbase_admin-2.3.4 → django_smartbase_admin-2.3.5}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "django-smartbase-admin"
-version = "2.3.4"
+version = "2.3.5"
 description = ""
 authors = ["SmartBase <info@smartbase.sk>"]
 readme = "README.md"

{django_smartbase_admin-2.3.4 → django_smartbase_admin-2.3.5}/src/django_smartbase_admin/admin/admin_base.py

@@ -151,7 +151,8 @@ from django_smartbase_admin.admin.widgets import (
     SBAdminAttributesWidget,
     SBAdminMultipleChoiceInlineWidget,
     SBAdminColorWidget,
-    SBAdminFilerFileWidget,
+    SBAdminFilerPickerWidget,
+    SBAdminFilerImagePickerWidget,
     SBAdminDateTimeRangeWidget,
 )
 from django_smartbase_admin.engine.admin_base_view import (
@@ -210,8 +211,8 @@ class SBAdminFormFieldWidgetsMixin:
         forms.HiddenInput: SBAdminHiddenWidget,
     }
     db_field_widgets = {
-        FilerImageField: SBAdminFilerFileWidget,
-        FilerFileField: SBAdminFilerFileWidget,
+        FilerImageField: SBAdminFilerImagePickerWidget,
+        FilerFileField: SBAdminFilerPickerWidget,
     }
     if postrgres_enabled:
         formfield_widgets[SimpleArrayField] = SBAdminArrayWidget

{django_smartbase_admin-2.3.4 → django_smartbase_admin-2.3.5}/src/django_smartbase_admin/admin/site.py

@@ -143,6 +143,7 @@ class SBAdminSite(admin.AdminSite):
             PasswordChangeView,
             PasswordChangeDoneView,
         )
+        from django_smartbase_admin.views.media_picker_view import MediaPickerView
         from django_smartbase_admin.views.user_config_view import ColorSchemeView
         from django_smartbase_admin.views.view_on_site_redirect_view import (
             ViewOnSiteRedirectView,
@@ -224,6 +225,11 @@ class SBAdminSite(admin.AdminSite):
                     self.admin_view(GlobalFilterView.as_view()),
                     name="global_filter",
                 ),
+                path(
+                    "media-picker/",
+                    self.admin_view(MediaPickerView.as_view()),
+                    name="media_picker",
+                ),
                 path(
                     "color-scheme/",
                     self.admin_view(ColorSchemeView.as_view()),

{django_smartbase_admin-2.3.4 → django_smartbase_admin-2.3.5}/src/django_smartbase_admin/admin/widgets.py

@@ -1,5 +1,4 @@
 import json
-import logging
 import sys
 
 from ckeditor.widgets import CKEditorWidget
@@ -8,7 +7,6 @@ from django import forms
 from django.conf import settings
 from django.contrib.admin.widgets import (
     AdminURLFieldWidget,
-    ForeignKeyRawIdWidget,
 )
 from django.contrib.auth.forms import ReadOnlyPasswordHashWidget
 from django.contrib.postgres.forms import RangeWidget
@@ -22,14 +20,12 @@ from django.db.models import ForeignKey, OneToOneField
 from django.template.loader import render_to_string
 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
 from django.utils.timezone import get_current_timezone_name
 from django.utils.translation import gettext_lazy as _, get_language
 from django.views.generic.base import ContextMixin
 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 (
@@ -45,6 +41,11 @@ from django_smartbase_admin.engine.filter_widgets import (
     AutocompleteFilterWidget,
     SBAdminTreeWidgetMixin,
 )
+from django_smartbase_admin.services.media_picker import (
+    MEDIA_PICKER_TYPE_FILE,
+    MEDIA_PICKER_TYPE_IMAGE,
+    FilerMediaPickerService,
+)
 from django_smartbase_admin.services.request_cache import (
     RequestCacheKey,
     cache_on_request,
@@ -56,7 +57,6 @@ from django_smartbase_admin.templatetags.sb_admin_tags import (
 from django_smartbase_admin.utils import (
     convert_django_to_flatpickr_format,
     is_modal,
-    sb_admin_filer_directory_listing_url_for_file,
 )
 
 try:
@@ -65,8 +65,6 @@ try:
 except ImportError:
     from django.contrib.admin.sites import NotRegistered
 
-logger = logging.getLogger(__name__)
-
 
 def get_datetime_placeholder(lang=None):
     lang = lang or get_language()
@@ -1455,67 +1453,99 @@ class SBAdminImageWidget(SBAdminBaseWidget, AdminImageWidget):
         )
 
 
-class SBAdminFilerFileWidget(SBAdminBaseWidget, FilerAdminFileWidget):
+class SBAdminFilerPickerWidget(SBAdminBaseWidget, FilerAdminFileWidget):
+    picker_type = MEDIA_PICKER_TYPE_FILE
+
+    class Media:
+        extend = False
+        js = [
+            *FilerAdminFileWidget.Media.js,
+            "sb_admin/dist/media_picker.js",
+        ]
+
     def __init__(self, form_field=None, *args, **kwargs):
         self.form_field = form_field
+        self.form = None
+        self.field_name = None
+        self.view = None
+        self.request = None
         super(FilerAdminFileWidget, self).__init__(
             form_field.rel, form_field.view.admin_site, *args, **kwargs
         )
 
-    def render(self, name, value, attrs=None, renderer=None):
-        obj = self.obj_for_value(value)
-        css_id = attrs.get("id", "id_image_x")
-        related_url = None
-        change_url = ""
-        if value:
-            try:
-                file_obj = File.objects.get(pk=value)
-                related_url = sb_admin_filer_directory_listing_url_for_file(file_obj)
-                change_url = reverse(
-                    "sb_admin:{}_{}_change".format(
-                        file_obj._meta.app_label,
-                        file_obj._meta.model_name,
-                    ),
-                    args=(file_obj.pk,),
+    def init_widget_dynamic(self, form, form_field, field_name, view, request):
+        super().init_widget_dynamic(form, form_field, field_name, view, request)
+        self.form = form
+        self.field_name = field_name
+        self.view = view
+        self.request = request
+
+    def get_request(self):
+        return self.request or SBAdminThreadLocalService.get_request()
+
+    def get_selected_object(self, value):
+        request = self.get_request()
+        if request is None or not hasattr(request, "request_data"):
+            return self.obj_for_value(value)
+        value = getattr(value, "pk", value)
+        try:
+            return (
+                FilerMediaPickerService.accessible_item_queryset(
+                    request,
+                    self.picker_type,
                 )
-            except Exception as e:
-                # catch exception and manage it. We can re-raise it for debugging
-                # purposes and/or just logging it, provided user configured
-                # proper logging configuration
-                if settings.FILER_ENABLE_LOGGING:
-                    logger.error("Error while rendering file widget: %s", e)
-                if settings.FILER_DEBUG:
-                    raise
-        if not related_url:
-            related_url = reverse("sb_admin:filer-directory_listing-last")
-        params = self.url_parameters()
-        params["_pick"] = "file"
-        if params:
-            lookup_url = "?" + urlencode(sorted(params.items()))
-        else:
-            lookup_url = ""
+                .filter(pk=value)
+                .first()
+            )
+        except (TypeError, ValueError, ValidationError):
+            return None
+
+    def value_from_datadict(self, data, files, name):
+        value = super().value_from_datadict(data, files, name)
+        initial = getattr(self.form, "initial", {}).get(self.field_name)
+        request = self.get_request()
+        if (
+            request is not None
+            and hasattr(request, "request_data")
+            and self.form_field.has_changed(initial, value)
+        ):
+            self.form_field.queryset = self.form_field.queryset & (
+                FilerMediaPickerService.accessible_item_queryset(
+                    request,
+                    self.picker_type,
+                )
+            )
+        return value
+
+    def render(self, name, value, attrs=None, renderer=None):
+        attrs = {} if attrs is None else attrs.copy()
+        css_id = attrs.get("id", f"id_{name}")
         if "class" not in attrs:
-            # The JavaScript looks for this hook.
             attrs["class"] = "vForeignKeyRawIdAdminField"
-        # rendering the super for ForeignKeyRawIdWidget on purpose here because
-        # we only need the input and none of the other stuff that
-        # ForeignKeyRawIdWidget adds
-        hidden_input = super(ForeignKeyRawIdWidget, self).render(
-            name, value, attrs
-        )  # grandparent super
+        hidden_input = forms.TextInput(attrs=attrs).render(name, value)
+        selected_item = None
+        obj = self.get_selected_object(value)
+        if obj is not None:
+            selected_item = FilerMediaPickerService.item_data(obj)
+
         context = {
             "hidden_input": hidden_input,
-            "lookup_url": "{}{}".format(related_url, lookup_url),
-            "change_url": change_url,
-            "object": obj,
-            "lookup_name": name,
             "id": css_id,
-            "admin_icon_delete": "admin/img/icon-deletelink.svg",
+            "endpoint": (
+                f"{reverse('sb_admin:media_picker')}?picker_type={self.picker_type}"
+            ),
+            "upload_url": FilerMediaPickerService.upload_url(None),
+            "object": obj,
+            "selected_item": selected_item,
+            "picker_type": self.picker_type,
         }
-        # using template name directly to prevent override of template_name
-        # when calling render of ForeignKeyRawIdWidget
-        html = render_to_string("sb_admin/widgets/filer_file.html", context)
-        return mark_safe(html)
+        return mark_safe(
+            render_to_string("sb_admin/widgets/filer_picker.html", context)
+        )
+
+
+class SBAdminFilerImagePickerWidget(SBAdminFilerPickerWidget):
+    picker_type = MEDIA_PICKER_TYPE_IMAGE
 
 
 class SBAdminReadOnlyPasswordHashWidget(SBAdminBaseWidget, ReadOnlyPasswordHashWidget):

{django_smartbase_admin-2.3.4 → django_smartbase_admin-2.3.5}/src/django_smartbase_admin/audit/sb_admin.py

@@ -181,6 +181,7 @@ class AdminAuditLogAdmin(SBAdmin):
             name="user_display",
             title="User",
             annotate=Coalesce(F("user__email"), Value(""), output_field=TextField()),
+            supporting_annotates={"user_source_val": F("source")},
             filter_field="user",
             filter_widget=AutocompleteFilterWidget(
                 model=get_user_model(),
@@ -806,8 +807,13 @@ class AdminAuditLogAdmin(SBAdmin):
     summary_html.short_description = _("Summary")
 
     def user_display(self, obj_id, value, **additional_data):
-        """Display the username or indicate if no user."""
-        return value if value else "-"
+        """Display the username, suffixed with the write channel when the
+        change didn't come through the admin UI (e.g. "user@x.sk (MCP)")."""
+        value = value if value else "-"
+        source = additional_data.get("user_source_val")
+        if source:
+            return f"{value} ({source.upper()})"
+        return value
 
     def action_type_display(self, obj_id, value, **additional_data):
         color = ACTION_COLORS.get(value, "secondary")

{django_smartbase_admin-2.3.4 → django_smartbase_admin-2.3.5}/src/django_smartbase_admin/engine/const.py

@@ -87,3 +87,5 @@ FIELDSET_HIDE_HEADER_CLASS = "hide-header"
 FIELDSET_PLAIN_CLASS = "sbadmin-fieldset-plain"
 ROW_CLASS_FIELD = "get_sbadmin_row_class"
 SUPPORTED_FILE_TYPE_ICONS = ["doc", "docx", "csv", "xls", "xlsx", "pdf", "ppt", "zip"]
+# How str(True) / str(False) arrive from a rendered choice — json.loads cannot read them.
+PYTHON_BOOL_LITERALS = {"True": True, "False": False}

{django_smartbase_admin-2.3.4 → django_smartbase_admin-2.3.5}/src/django_smartbase_admin/engine/filter_widgets.py

@@ -30,6 +30,7 @@ from django_smartbase_admin.engine.const import (
     AUTOCOMPLETE_PAGE_SIZE_NAME,
     AUTOCOMPLETE_FORWARD_NAME,
     SELECT_ALL_KEYWORD,
+    PYTHON_BOOL_LITERALS,
 )
 from django_smartbase_admin.services.translations import SBAdminTranslationsService
 from django_smartbase_admin.services.views import SBAdminViewService
@@ -246,6 +247,11 @@ class BooleanFilterWidget(SBAdminFilterWidget):
 
     def parse_value_from_input(self, request, filter_value):
         input_value = super().parse_value_from_input(request, filter_value)
+        # The radio template renders the choices above as str(True) / str(False); without this
+        # "False" would stay a string and read as truthy in a filter_query_lambda (and trip
+        # validate_value below).
+        if isinstance(input_value, str) and input_value in PYTHON_BOOL_LITERALS:
+            return PYTHON_BOOL_LITERALS[input_value]
         try:
             input_value = json.loads(input_value)
         except:

{django_smartbase_admin-2.3.4 → django_smartbase_admin-2.3.5}/src/django_smartbase_admin/locale/cs/LC_MESSAGES/django.po

@@ -2,13 +2,13 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
+# 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2026-07-03 17:03+0200\n"
+"POT-Creation-Date: 2026-08-12 14:16+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -99,10 +99,8 @@ msgstr "Historie změn: %s"
 msgid "View"
 msgstr "Zobrazit"
 
-#, fuzzy
-#| msgid "Created"
 msgid "Create"
-msgstr "Vytvořeno"
+msgstr "Vytvořit"
 
 msgid "Edit"
 msgstr "Upravit"
@@ -158,12 +156,26 @@ msgstr "Souhrn"
 msgid "Publish"
 msgstr "Publikovat"
 
+msgid "Row ID"
+msgstr ""
+
+#, fuzzy
+#| msgid "Columns"
+msgid "Column"
+msgstr "Sloupce"
+
+msgid "Value"
+msgstr "Hodnota"
+
 msgid "Search..."
 msgstr "Hledat..."
 
 msgid "Exit Reorder"
 msgstr "Ukončit přeuspořádání"
 
+msgid "Not Implemented"
+msgstr ""
+
 #, python-brace-format
 msgid "Reorder {self.model._meta.verbose_name}"
 msgstr "Přeuspořádat {self.model._meta.verbose_name}"
@@ -275,6 +287,120 @@ msgctxt "Tree widget"
 msgid "No data."
 msgstr "Žádná data."
 
+msgid "Calls"
+msgstr ""
+
+#, fuzzy
+#| msgid "Timezone"
+msgid "Time"
+msgstr "Časové pásmo"
+
+msgid "User"
+msgstr "Uživatel"
+
+msgid "Tool"
+msgstr ""
+
+msgid "Record count"
+msgstr ""
+
+#, fuzzy
+#| msgid "Bulk operation"
+msgid "Duration"
+msgstr "Hromadná operace"
+
+#, fuzzy
+#| msgid "Error:"
+msgid "Error"
+msgstr "Chyba:"
+
+msgid "MCP calls"
+msgstr ""
+
+#, fuzzy
+#| msgid "Error:"
+msgid "Errors"
+msgstr "Chyba:"
+
+msgid "Avg duration (ms)"
+msgstr ""
+
+#, fuzzy
+#| msgid "items affected"
+msgid "Items returned"
+msgstr "ovlivněných položek"
+
+msgid "Request (KB)"
+msgstr ""
+
+msgid "Response (KB)"
+msgstr ""
+
+msgid "Total"
+msgstr ""
+
+#, fuzzy
+#| msgid "All users"
+msgid "By user"
+msgstr "Všichni uživatelé"
+
+msgid "Grouping"
+msgstr ""
+
+msgid "AI Assistant Module"
+msgstr ""
+
+msgid "Request"
+msgstr ""
+
+msgid "Request size (B)"
+msgstr ""
+
+msgid "Response size (B)"
+msgstr ""
+
+msgid "Duration (ms)"
+msgstr ""
+
+#, fuzzy
+#| msgid "results"
+msgid "Result status"
+msgstr "výsledky"
+
+msgid "Returned field count"
+msgstr ""
+
+msgid "Returned inline count"
+msgstr ""
+
+msgid "Returned inline rows"
+msgstr ""
+
+#, fuzzy
+#| msgid "Error:"
+msgid "Error type"
+msgstr "Chyba:"
+
+#, fuzzy
+#| msgid "New message"
+msgid "Error message"
+msgstr "Nová zpráva"
+
+msgid "Outcome"
+msgstr ""
+
+msgid "Request (B)"
+msgstr ""
+
+msgid "Response (B)"
+msgstr ""
+
+msgid "Response"
+msgstr ""
+
+msgid "OK"
+msgstr ""
+
 msgid "Toast"
 msgstr "Toast"
 
@@ -367,6 +493,9 @@ msgstr "Světlý"
 msgid "Theme"
 msgstr "Motiv"
 
+msgid "A folder with this name already exists."
+msgstr "Složka s tímto názvem již existuje."
+
 msgid "Translations"
 msgstr "Překlady"
 
@@ -493,9 +622,6 @@ msgstr "Pro stránku"
 msgid "Date/time"
 msgstr "Datum/čas"
 
-msgid "User"
-msgstr "Uživatel"
-
 msgid "Action"
 msgstr "Akce"
 
@@ -550,9 +676,6 @@ msgstr "ovlivněných položek"
 msgid "Field"
 msgstr "Pole"
 
-msgid "Value"
-msgstr "Hodnota"
-
 msgid "No changes recorded."
 msgstr "Žádné změny nebyly zaznamenány."
 
@@ -945,6 +1068,76 @@ msgstr "Změněno"
 msgid "Owner"
 msgstr "Vlastník"
 
+msgid "Select image"
+msgstr "Vybrat obrázek"
+
+msgid "Select file"
+msgstr "Vybrat soubor"
+
+msgid "Search images"
+msgstr "Hledat obrázky"
+
+msgid "Search files"
+msgstr "Hledat soubory"
+
+msgid "Sort"
+msgstr "Řazení"
+
+msgid "Newest first"
+msgstr "Nejnovější první"
+
+msgid "Oldest first"
+msgstr "Nejstarší první"
+
+msgid "Name A-Z"
+msgstr "Název A–Z"
+
+msgid "Name Z-A"
+msgstr "Název Z–A"
+
+msgid "Grid view"
+msgstr "Zobrazení mřížky"
+
+msgid "List view"
+msgstr "Zobrazení seznamu"
+
+msgid "Upload"
+msgstr "Nahrát"
+
+msgid "New folder"
+msgstr "Nová složka"
+
+msgid "Folder name"
+msgstr "Název složky"
+
+msgid "Media library"
+msgstr "Knihovna médií"
+
+msgid "Uploading"
+msgstr "Nahrávání"
+
+msgid "No images found"
+msgstr "Nebyly nalezeny žádné obrázky"
+
+msgid "No files found"
+msgstr "Nebyly nalezeny žádné soubory"
+
+msgid " of "
+msgstr " z "
+
+msgid "Previous page"
+msgstr "Předchozí stránka"
+
+msgctxt "pagination"
+msgid "Page"
+msgstr "Strana"
+
+msgid "Next page"
+msgstr "Další stránka"
+
+msgid "Done"
+msgstr "Hotovo"
+
 msgid "Acknowledge"
 msgstr "Rozumím"
 
@@ -989,6 +1182,10 @@ msgstr "<strong>0</strong> položek"
 msgid "${value} selected"
 msgstr "${value} vybráno"
 
+msgctxt "pagination"
+msgid "Go"
+msgstr "Přejít"
+
 msgid "Unsaved changes"
 msgstr "Neuložené změny"
 
@@ -1062,6 +1259,17 @@ msgstr "Vyhledat"
 msgid "Choose File"
 msgstr "Vybrat soubor"
 
+msgid "Choose image"
+msgstr "Vybrat obrázek"
+
+#, fuzzy
+#| msgid "Choose File"
+msgid "Choose file"
+msgstr "Vybrat soubor"
+
+msgid "Change image"
+msgstr "Změnit obrázek"
+
 msgid "Search permissions…"
 msgstr "Vyhledat oprávnění…"
 
@@ -1134,6 +1342,9 @@ msgstr "Primární"
 msgid "Secondary"
 msgstr "Sekundární"
 
+msgid "Invalid folder."
+msgstr "Neplatná složka."
+
 msgid "Finish"
 msgstr "Dokončit"
 
@@ -1155,9 +1366,6 @@ msgstr "Přeloženo"
 msgid "Status"
 msgstr "Stav"
 
-msgid " of "
-msgstr " z "
-
 msgid "Language"
 msgstr "Jazyk"
 
@@ -1196,11 +1404,3 @@ msgstr "Jazyk"
 #, python-format
 #~ msgid "Are you sure you want to delete the selected %(objects_name)s? All of the following objects and their related items will be deleted:"
 #~ msgstr "Opravdu chcete smazat vybrané %(objects_name)s? Všechny následující objekty a jejich související položky budou smazány:"
-
-msgctxt "pagination"
-msgid "Page"
-msgstr "Strana"
-
-msgctxt "pagination"
-msgid "Go"
-msgstr "Přejít"