django-smartbase-admin 0.2.54__py3-none-any.whl → 1.0.42__py3-none-any.whl

django_smartbase_admin/templates/sb_admin/widgets/filer_file.html

@@ -0,0 +1,84 @@
+{% load i18n filer_admin_tags static %}
+
+{% spaceless %}
+    <div class="clearfix"></div>
+
+    <div class="dz-preview dz-file-preview hidden js-filer-dropzone-template">
+        <span class="filerFile">
+            <div class="dz-thumbnail"><img class="quiet" data-dz-thumbnail></div>
+            <div>
+                <span data-dz-name class="dz-name"></span>
+                <span class="filerClearer filer-icon filer-icon-remove-selection" title="{% trans 'Clear' %}"
+                     data-dz-remove data-no-icon-file="{% static 'filer/icons/file-unknown.svg' %}">
+                    <button type="button" class="btn btn-tiny btn-destructive">{% trans 'Delete' %}</button>
+                </span>
+            </div>
+            <div class="dz-progress js-filer-dropzone-progress"><span class="dz-upload" data-dz-uploadprogress></span></div>
+        </span>
+    </div>
+
+    <div class="js-filer-dropzone filer-dropzone{% if object %} js-object-attached{% endif %}"
+         data-url="{% url 'admin:filer-ajax_upload' %}"
+         data-max-files="1"
+         {% if max_filesize %}}data-max-filesize="{{ max_filesize|safe }}"{% endif %}>
+        <div class="z-index-fix"></div>
+        <div class="dz-default dz-message js-filer-dropzone-message{% if object %} hidden{% endif %}">
+            <span class="w-64 h-64 flex items-center justify-center rounded-full mr-16 js-input-file-empty input-file-upload-icon">
+                <svg class="w-24 h-24">
+                    <use xlink:href="#Upload"></use>
+                </svg>
+            </span>
+            <span>{% trans "drop your file here or" %}</span>
+        </div>
+
+        <span class="filerFile js-file-selector">
+            {% if object %}
+                {% if object.file.exists %}
+                    <a href="{{ object.url }}" target="_blank">{% file_icon object size='64x64' %}</a>
+                {% else %}
+                    {% file_icon object %}
+                {% endif %}
+            {% else %}
+                <img class="thumbnail_img hidden quiet" alt="{% trans 'No file selected' %}">
+            {% endif %}
+
+            <div>
+                {% if object %}
+                    {% if object.file.exists %}
+                        <span class="description_text">{{ object.label }}</span>
+                    {% else %}
+                        {% file_icon object %}
+                        <span class="description_text">{% trans 'File is missing' %}</span>
+                    {% endif %}
+                {% else %}
+                    <span class="description_text"></span>
+                {% endif %}
+
+                <div class="flex items-center gap-4">
+                    <a class="filerClearer {% if not object %}hidden{% endif %}" title="{% trans 'Clear' %}"
+                       data-no-icon-file="{% static 'filer/icons/file-unknown.svg' %}">
+                        <button type="button" class="btn btn-tiny btn-destructive">{% trans 'Delete' %}</button>
+                    </a>
+
+                    <a href="{{ lookup_url }}" class="js-related-lookup related-lookup {% if object %}related-lookup-change{% endif %} lookup" id="{{ id }}_lookup"
+                       title="{% trans 'Lookup' %}">
+                        <button type="button" class="btn btn-primary-light btn-tiny add-file-button">{% trans 'Choose File' %}</button>
+                    </a>
+                </div>
+            </div>
+
+
+            <div class="hidden">{{ hidden_input }}</div>
+            <script type="text/javascript" id="{{id}}_javascript">
+                django.jQuery(document).ready(function(){
+                    var plus = django.jQuery('#add_{{ id }}');
+                    if (plus.length){
+                        plus.remove();
+                    }
+                    // Delete this javascript once loaded to avoid the "add new" link duplicates it
+                    django.jQuery('#{{id}}_javascript').remove();
+                });
+            </script>
+        </span>
+    </div>
+{% endspaceless %}

django_smartbase_admin/templates/sb_admin/widgets/includes/related_item_buttons.html

@@ -0,0 +1,38 @@
+{% load i18n %}
+<div class="flex items-center gap-4 flex-shrink-0 related-item-buttons">
+    {% if widget.attrs.related_edit_url or widget.attrs.related_add_url %}
+        <a
+                class="btn btn-icon edit-button {% if not widget.attrs.related_edit_url %}hidden{% endif %}"
+                title="{% trans 'Edit' %}"
+                {% if widget.attrs.related_edit_url %}
+                    hx-get="{{ widget.attrs.related_edit_url }}?_popup=1&sbadmin_is_modal=1&sb_admin_source_field={{ widget.attrs.id }}{% if reload_on_save %}&sbadmin_reload_on_save=1{% endif %}"
+                {% endif %}
+                {% if widget.attrs.related_add_url and not widget.attrs.related_edit_url %}
+                    data-add-url="{{ widget.attrs.related_add_url }}?_popup=1&sbadmin_is_modal=1&sb_admin_source_field={{ widget.attrs.id }}"
+                {% endif %}
+                data-bs-toggle="modal"
+                data-bs-target="#sb-admin-modal"
+                hx-target="#sb-admin-modal"
+                hx-select="#modal-content"
+                hx-swap="innerHTML">
+            <svg class="w-20 h-20">
+                <use xlink:href="#Edit"></use>
+            </svg>
+        </a>
+    {% endif %}
+    {% if widget.attrs.related_add_url %}
+        <a
+                class="btn btn-icon"
+                title="{% trans 'Add' %}"
+                data-bs-toggle="modal"
+                data-bs-target="#sb-admin-modal"
+                hx-get="{{ widget.attrs.related_add_url }}?_popup=1&sbadmin_is_modal=1&sb_admin_source_field={{ widget.attrs.id }}"
+                hx-target="#sb-admin-modal"
+                hx-select="#modal-content"
+                hx-swap="innerHTML">
+            <svg class="w-20 h-20">
+                <use xlink:href="#Add-one"></use>
+            </svg>
+        </a>
+    {% endif %}
+</div>

django_smartbase_admin/templates/sb_admin/widgets/multiwidget.html

@@ -1,7 +1,7 @@
 {% include 'sb_admin/widgets/includes/field_label.html' %}
 <div class="flex gap-16">
     {% for widget in widget.subwidgets %}
-        <div class="relative flex-1">
+        <div class="relative">
             {% include widget.template_name with subwidget=True %}
         </div>
     {% endfor %}

django_smartbase_admin/templates/sb_admin/widgets/radio.html

@@ -1,12 +1,13 @@
+{% include 'sb_admin/widgets/includes/field_label.html' %}
 {% with id=widget.attrs.id %}
     <ul{% if id %} id="{{ id }}"{% endif %}>
         {% for group, options, index in widget.optgroups %}
             {% for option in options %}
-                <li>
+                <li class="relative py-8">
                     {% include option.template_name with widget=option %}
                 </li>
             {% endfor %}
         {% endfor %}
     </ul>
 {% endwith %}
-
+{% include 'sb_admin/widgets/includes/help_text.html' %}

django_smartbase_admin/templates/sb_admin/widgets/radio_dropdown.html

@@ -0,0 +1,30 @@
+{% load i18n %}
+
+<div class="relative">
+    {% include 'sb_admin/widgets/includes/simple_field_label.html' with label_classes="radio-dropdown-label inline-flex text-dark-900 mb-8 text-14 leading-18 font-medium" %}
+    <div id="{{ widget.attrs.id }}-wrapper" class="js-simple-multiselect-detail js-dropdown-wrapper">
+        <button
+                data-bs-toggle="dropdown"
+                aria-expanded="false"
+                data-bs-offset="[0, 8]"
+                class="btn px-10 font-normal w-full"
+        >
+            <span id="{{ widget.attrs.id }}-value" class="js-dropdown-label flex gap-8">{{ widget.form_field.empty_label }}</span>
+            <svg class="ml-8 no-rotate text-dark">
+                <use xlink:href="#Sort Alt"></use>
+            </svg>
+        </button>
+        <div id="{{ widget.attrs.id }}-dropdown" class="dropdown-menu">
+            <ul id="{{ widget.attrs.id }}" class="relative py-8">
+                {% for group, options, index in widget.optgroups %}
+                    {% for option in options %}
+                        <li>
+                            {% include option.template_name with widget=option %}
+                        </li>
+                    {% endfor %}
+                {% endfor %}
+            </ul>
+        </div>
+    </div>
+</div>
+{% include 'sb_admin/widgets/includes/help_text.html' %}

django_smartbase_admin/templates/sb_admin/widgets/read_only_password_hash.html

@@ -1,4 +1,7 @@
 {% include 'sb_admin/widgets/includes/field_label.html' %}
 <div {% include "sb_admin/widgets/attrs.html" %}>
     <p class="text-14 leading-18 read-only-password-hash">{{ widget.form_field.help_text|safe }}</p>
+    {% if button_label %}
+        <p class="mt-8"><a class="btn btn-small" href="{{ password_url|default:"../password/" }}">{{ button_label }}</a></p>
+    {% endif %}
 </div>

django_smartbase_admin/templates/sb_admin/widgets/time.html

@@ -1,3 +1,10 @@
 {% include 'sb_admin/widgets/includes/field_label.html' %}
-{% include "sb_admin/widgets/input.html" %}
+<div class="relative flex time-wrapper">
+    {% include "sb_admin/widgets/input.html" %}
+    <label class="absolute right-10 top-0 bottom-0 h-full flex items-center pointer-events-none" for="{{ widget.attrs.id }}">
+        <svg class="w-20 h-20">
+            <use xlink:href="#Time"></use>
+        </svg>
+    </label>
+</div>
 {% include 'sb_admin/widgets/includes/help_text.html' %}

django_smartbase_admin/templates/sb_admin/widgets/toggle.html

@@ -1,4 +1,4 @@
-<div class="relative">
+<div class="relative min-h-24">
     {% include "sb_admin/widgets/input.html" %}
     <label for="{{ widget.attrs.id }}"></label>
     {% include 'sb_admin/widgets/includes/simple_field_label.html' %}

django_smartbase_admin/templates/sb_admin/widgets/tree_base.html

@@ -0,0 +1,59 @@
+{% load static sb_admin_tags i18n %}
+
+{% if not hide_tree_search %}
+    <div class="border-b border-dark-200 {{ search_wrapper_classes }}">
+        <div class="js-tree-widget-search relative">
+            {% trans 'Search' as search_string %}
+            <input id="{{ tree_component_id }}_search" name="search" placeholder="{{ tree_filter_placeholder|default:search_string }}" autocomplete="off" class="input pl-36" type="search">
+            <div class="absolute pl-10 left-0 top-0 bottom-0 flex items-center gap-8 rounded-r">
+                <svg class="w-20 h-20">
+                    <use xlink:href="#Search"></use>
+                </svg>
+            </div>
+        </div>
+    </div>
+{% endif %}
+<div class="{{ table_wrapper_classes }}">
+    <table style="width: 100%;" id="{{ tree_component_id }}_tree" class="js-tree-widget fancytree-ext-table" data-tree-data-id="{{ tree_component_id }}_data" data-tree-additional-columns-id="{{ tree_component_id }}_additional_columns" data-tree-strings-id="{{ tree_component_id }}_tree_strings">
+        <thead>
+        <tr>
+            {% if tree_show_checkbox %}
+                <th class="select-all-checkbox-wrapper"></th>
+            {% endif %}
+            <th class="text-left">{{ tree_main_column_name }}<span id="{{ tree_component_id }}_matches" class="ml-4"></span></th>
+            {% for column in tree_additional_columns %}
+                <th>{{ column.title }}</th>
+            {% endfor %}
+        </tr>
+        </thead>
+        <tbody>
+        <tr>
+            {% if tree_show_checkbox %}
+                <td class="alignCenter fancytree-checkbox-column"></td>{% endif %}
+            <td></td>
+            {% for column in tree_additional_columns %}
+                <td></td>
+            {% endfor %}
+        </tr>
+        </tbody>
+    </table>
+</div>
+
+<script id="{{ tree_component_id }}_data" type="application/json">
+    {
+        "filter": {% if tree_filter %}true{% else %}false{% endif %},
+        "input_id": "{{ tree_component_id }}",
+        "data_url": "{{ tree_data_url }}",
+        "checkbox": {% if tree_show_checkbox %}true{% else %}false{% endif %},
+        "multiselect": {% if tree_multiselect %}2{% else %}1{% endif %},
+        "detail_url":"{{ tree_detail_url }}",
+        "reorder_url":"{{ tree_reorder_url }}",
+        "filter_by_table_data": {% if filter_by_table_data %}true{% else %}false{% endif %},
+        "allow_select_all": {% if allow_select_all %}true{% else %}false{% endif %}
+    }
+</script>
+{{ fancytree_filter_settings|get_json_script:'fancytree_filter_settings' }}
+<script id="{{ tree_component_id }}_additional_columns" type="application/json">{{ tree_additional_columns|get_json|safe }}</script>
+<script id="{{ tree_component_id }}_tree_strings" type="application/json">
+    {{ tree_strings|get_json|safe }}
+</script>

django_smartbase_admin/templates/sb_admin/widgets/tree_select.html

@@ -0,0 +1,24 @@
+{% load sb_admin_tags %}
+
+<div class="relative">
+    {% include 'sb_admin/widgets/includes/field_label.html' %}
+    <div id="{{ widget.attrs.id }}-wrapper" class="tree-widget-wrapper">
+        <input type="hidden" id="{{ widget.attrs.id }}" name="{{ widget.name }}"{% if widget.raw_value %} value="{{ widget.raw_value|get_json }}"{% endif %}>
+        <button
+                data-bs-toggle="dropdown"
+                aria-expanded="false"
+                data-bs-offset="[0, 8]"
+                class="btn px-10 font-normal w-full"
+        >
+            <span id="{{ widget.attrs.id }}_label">{% get_item widget.value_dict widget.raw_value widget.form_field.empty_label %}</span>
+            <svg class="ml-8">
+                <use xlink:href="#Down"></use>
+            </svg>
+        </button>
+        <div class="dropdown-menu max-h-none w-248">
+            <div class="py-8">
+                {% include "sb_admin/widgets/tree_base.html" with tree_additional_columns=widget.additional_columns tree_strings=widget.tree_strings tree_value=widget.raw_value tree_multiselect=filter_widget.multiselect tree_component_id=widget.attrs.id tree_data_url=filter_widget.to_json.autocomplete_url tree_show_checkbox=True table_wrapper_classes="max-h-432 overflow-auto custom-scrollbar" %}
+            </div>
+        </div>
+    </div>
+</div>

django_smartbase_admin/templates/sb_admin/widgets/tree_select_inline.html

@@ -0,0 +1,12 @@
+{% load sb_admin_tags %}
+
+<div class="relative -mb-2">
+    <script>
+        document.currentScript.closest('.djn-table').querySelector('.djn-thead').classList.add('hidden');
+    </script>
+    <div id="{{ widget.attrs.id }}-wrapper" class="tree-widget-wrapper">
+        <input type="hidden" id="{{ widget.attrs.id }}" name="{{ widget.name }}"{% if widget.raw_value %}
+               value="{{ widget.raw_value|get_json }}"{% endif %}>
+        {% include "sb_admin/widgets/tree_base.html" with tree_main_column_name=filter_widget.form_field.label tree_strings=widget.tree_strings tree_additional_columns=widget.additional_columns tree_value=widget.raw_value tree_multiselect=filter_widget.multiselect tree_component_id=widget.attrs.id tree_data_url=filter_widget.to_json.autocomplete_url tree_show_checkbox=True table_wrapper_classes="max-h-432 overflow-auto custom-scrollbar" search_wrapper_classes="pb-16 px-16" allow_select_all=True %}
+    </div>
+</div>

django_smartbase_admin/templatetags/sb_admin_tags.py

@@ -1,13 +1,22 @@
 import json
+import os
 
 from django import template
 from django.contrib.admin.templatetags.admin_modify import submit_row
+from django.contrib.admin.utils import lookup_field
+from django.core.exceptions import ObjectDoesNotExist
 from django.core.serializers.json import DjangoJSONEncoder
 from django.template.defaultfilters import json_script
+from django.templatetags.static import static
 from django.utils.safestring import mark_safe
 from django.utils.text import get_text_list
 from django.utils.translation import gettext
+from easy_thumbnails.exceptions import InvalidImageFormatError
 
+from django_smartbase_admin.engine.const import (
+    ROW_CLASS_FIELD,
+    SUPPORTED_FILE_TYPE_ICONS,
+)
 from django_smartbase_admin.templatetags.base import InclusionSBAdminNode
 
 register = template.Library()
@@ -41,6 +50,36 @@ def get_item(dictionary, key):
     return dictionary.get(key, None) if dictionary else None
 
 
+@register.simple_tag(takes_context=True)
+def sb_admin_prepopulated_fields_init(context):
+    adminform = context.get("adminform")
+    if not adminform:
+        return ""
+
+    data = []
+    for f in adminform.prepopulated_fields:
+        bf = f["field"]
+        deps = f["dependencies"]
+        data.append(
+            {
+                "id": f"#{bf.id_for_label}",
+                "name": bf.name,
+                "dependency_ids": [f"#{d.id_for_label}" for d in deps],
+                "dependency_list": [d.name for d in deps],
+                "maxLength": getattr(bf.field, "max_length", None) or 50,
+                "allowUnicode": bool(getattr(bf.field, "allow_unicode", False)),
+            }
+        )
+
+    opts = context.get("opts")
+    element_id = (
+        f"sbadmin_prepopulated_fields_{opts.app_label}_{opts.model_name}"
+        if opts
+        else "sbadmin_prepopulated_fields"
+    )
+    return mark_safe(get_json_script(data, element_id))
+
+
 @register.tag(name="submit_row")
 def submit_row_tag(parser, token):
     return InclusionSBAdminNode(
@@ -78,7 +117,7 @@ def sb_admin_render_form_field(context, form_field, label_as_placeholder=False):
 @register.simple_tag
 def get_tabular_context(fieldsets, inlines, tabs):
     default_tabs = False
-    has_error = False
+    any_error = False
     first_error_tab = True
     tabular_context = {}
     inlines_map = {inline.opts.__class__: inline for inline in inlines}
@@ -90,6 +129,7 @@ def get_tabular_context(fieldsets, inlines, tabs):
         default_tabs = True
     for key, values in tabs.items():
         for value in values:
+            has_error = False
             fieldset_value = fieldsets_map.get(value)
             inline_value = inlines_map.get(value)
             tabular_context[key] = tabular_context.get(
@@ -99,7 +139,15 @@ def get_tabular_context(fieldsets, inlines, tabs):
                 tabular_context[key]["content"].append(
                     {"type": "fieldset", "value": fieldset_value}
                 )
-                error_present = bool(fieldset_value.form.errors)
+                fieldset_fields = set()
+                for field in fieldset_value.fields:
+                    if isinstance(field, (list, tuple)):
+                        fieldset_fields.update(set(field))
+                    else:
+                        fieldset_fields.add(field)
+                error_present = bool(
+                    set(fieldset_value.form.errors.keys()).intersection(fieldset_fields)
+                )
                 has_error = has_error or error_present
                 tabular_context[key]["error"] = (
                     tabular_context[key]["error"] or error_present
@@ -114,18 +162,19 @@ def get_tabular_context(fieldsets, inlines, tabs):
                     tabular_context[key]["error"] or error_present
                 )
             if has_error:
+                any_error = True
                 tabular_context[key]["classes"].add("error")
                 if first_error_tab:
                     tabular_context[key]["classes"].update(["active", "show"])
                     first_error_tab = False
-    if not has_error:
+    if not any_error:
         tabular_context[list(tabular_context.keys())[0]]["classes"].update(
             ["active", "show"]
         )
     return {
         "context": tabular_context,
         "default_tabs": default_tabs,
-        "has_error": has_error,
+        "has_error": any_error,
     }
 
 
@@ -202,3 +251,65 @@ def get_log_entry_message(log_entry):
         return get_change_message_legacy(log_entry)
     except Exception as e:
         return ""
+
+
+@register.simple_tag
+def call_method(obj, method_name, *args):
+    method = getattr(obj, method_name, None)
+    if method:
+        return method(*args)
+    return False
+
+
+@register.simple_tag
+def get_row_class(inline_admin_form):
+    try:
+        f, attr, value = lookup_field(
+            ROW_CLASS_FIELD, inline_admin_form.original, inline_admin_form.model_admin
+        )
+    except (AttributeError, ValueError, ObjectDoesNotExist):
+        return ""
+    return value
+
+
+@register.filter
+def is_row_class_field(field):
+    return isinstance(field, dict) and field["name"] == ROW_CLASS_FIELD
+
+
+@register.simple_tag
+def get_file_extension(file):
+    if not file:
+        return ""
+    name, extension = os.path.splitext(file.name)
+    return extension.lower().replace(".", "")
+
+
+@register.simple_tag
+def get_file_preview_image(
+    file, file_extension=None, thumbnail_width=64, thumbnail_height=64
+):
+    file_extension = file_extension or get_file_extension(file)
+    if file_extension in ["jpg", "jpeg", "png"]:
+        from easy_thumbnails.files import get_thumbnailer
+
+        thumbnailer = get_thumbnailer(file)
+        try:
+            thumb = thumbnailer.get_thumbnail(
+                {
+                    "size": (thumbnail_width, thumbnail_height),
+                    "crop": True,
+                    "replace_alpha": "#fff",
+                }
+            )
+            return thumb.url
+        except ValueError:
+            return file.url
+        except InvalidImageFormatError:
+            return static("sb_admin/images/file_types/file-other.svg")
+    if file_extension == "svg" or file_extension == "webp":
+        return file.url
+    for extension in SUPPORTED_FILE_TYPE_ICONS:
+        if file_extension == extension:
+            return static(f"sb_admin/images/file_types/file-{extension}.svg")
+    return static("sb_admin/images/file_types/file-other.svg")

django_smartbase_admin/utils.py

@@ -1,8 +1,13 @@
+import logging
+from collections.abc import Iterable
+
 from django import forms
 from django.conf import settings
 from django.contrib.admin.helpers import Fieldset
 from django.template.loader import render_to_string
 
+logger = logging.getLogger(__name__)
+
 
 class JSONSerializableMixin(object):
     def to_json(self):
@@ -35,15 +40,29 @@ def render_notifications(request):
     return render_to_string("sb_admin/includes/notifications.html", request=request)
 
 
+def is_modal(request):
+    from django_smartbase_admin.engine.admin_base_view import SBADMIN_IS_MODAL_VAR
+
+    return request and (
+        SBADMIN_IS_MODAL_VAR in request.GET or SBADMIN_IS_MODAL_VAR in request.POST
+    )
+
+
 class FormFieldsetMixin(forms.Form):
-    def fieldsets(self):
+    def get_fieldsets(self) -> Iterable[tuple[str | None, dict]]:
         meta = getattr(self, "Meta", None)
+        return getattr(meta, "fieldsets", tuple())
 
-        if not meta or not meta.fieldsets:
+    def fieldsets(self) -> Iterable[Fieldset]:
+        if not (fieldsets := self.get_fieldsets()):
+            logger.warning(
+                "No fieldsets defined for form %s. Using form fields as fallback.",
+                self.__class__.__name__,
+            )
             yield Fieldset(form=self, fields=self.fields)
             return
 
-        for name, data in meta.fieldsets:
+        for name, data in fieldsets:
             yield Fieldset(
                 form=self,
                 name=name,

django_smartbase_admin/views/dashboard_view.py

@@ -11,6 +11,7 @@ class SBAdminDashboardView(SBAdminView):
     menu_action = Action.DASHBOARD.value
     widgets = None
     title = None
+    direct_sub_views = None
 
     def __init__(self, title=None, widgets=None) -> None:
         super().__init__()
@@ -27,16 +28,21 @@ class SBAdminDashboardView(SBAdminView):
             view.init_view_dynamic(request, request_data, **kwargs)
 
     def get_sub_views(self, configuration):
+        self.direct_sub_views = []
         self.sub_views = []
         for idx, widget_view in enumerate(self.widgets):
             widget_view.widget_id = f"{self.get_id()}_{idx}"
             widget_view.init_widget_static(configuration)
+            widget_view_sub_views = widget_view.get_sub_views(configuration) or []
             self.sub_views.append(widget_view)
+            self.direct_sub_views.append(widget_view)
+            self.sub_views.extend(widget_view_sub_views)
         return self.sub_views
 
     def dashboard(self, request, modifier):
         context = self.get_global_context(request)
         context["sub_views"] = self.sub_views
+        context["direct_sub_views"] = self.direct_sub_views
         context["title"] = self.get_title()
         return TemplateResponse(
             request,

django_smartbase_admin/views/global_filter_view.py

@@ -4,7 +4,10 @@ from django.http import HttpResponse
 from django.shortcuts import redirect
 from django.views import View
 
-from django_smartbase_admin.engine.const import GLOBAL_FILTER_DATA_KEY
+from django_smartbase_admin.engine.const import (
+    GLOBAL_FILTER_DATA_KEY,
+    TABLE_RELOAD_DATA_EVENT_NAME,
+)
 from django_smartbase_admin.utils import is_htmx_request, querydict_to_dict
 
 
@@ -13,10 +16,13 @@ class GlobalFilterView(View):
         response = redirect(request.headers.get("referer", ""))
         if is_htmx_request(request.META):
             response = HttpResponse()
-            response["HX-Trigger"] = json.dumps({"SBAdminReloadTableData": ""})
+            response["HX-Trigger"] = json.dumps({TABLE_RELOAD_DATA_EVENT_NAME: ""})
         new_global_filter_data = querydict_to_dict(request.POST)
         request.request_data.global_filter = new_global_filter_data
         request.request_data.configuration.init_global_filter_form_instance(request)
         if request.request_data.global_filter_instance.is_valid():
             request.session[GLOBAL_FILTER_DATA_KEY] = new_global_filter_data
+        response = request.request_data.configuration.process_global_filter_response(
+            response, request
+        )
         return response

django_smartbase_admin/views/translations_view.py

@@ -9,6 +9,7 @@ from django.forms import modelform_factory
 from django.http import HttpResponse, HttpResponseRedirect
 from django.template.response import TemplateResponse
 from django.utils.html import format_html
+from django.utils.safestring import mark_safe
 from django.utils.translation import gettext_lazy as _
 
 from django_smartbase_admin.actions.admin_action_list import SBAdminListAction
@@ -125,7 +126,7 @@ class ModelTranslationView(SBAdminView, SBAdminBaseListView):
         lang_codes.extend(selected_lang_codes)
         return lang_codes
 
-    def init_fields_cache(self, fields_source=None, configuration=None):
+    def init_fields_cache(self, fields_source=None, configuration=None, force=False):
         return
 
     def get_field_map(self, request):
@@ -161,7 +162,7 @@ class ModelTranslationView(SBAdminView, SBAdminBaseListView):
                     annotate=Case(
                         When(
                             **{
-                                f"{annotate_name}_count": F(
+                                f"{annotate_name}_count__gte": F(
                                     f"{main_lang_annotate_name}_count"
                                 ),
                                 "then": Value(self.TRANSLATION_TRANSLATED),
@@ -207,11 +208,17 @@ class ModelTranslationView(SBAdminView, SBAdminBaseListView):
 
     def format_translation_status(self, object_id, value):
         if value == self.TRANSLATION_NOT_TRANSLATED:
-            return f'<span class="badge badge-simple badge-neutral"><svg class="w-16 h-16 mr-4 text-invisible"><use xlink:href="#Add-one"></use></svg>{_("Not Translated")}</span>'
+            return mark_safe(
+                f'<span class="badge badge-simple badge-neutral"><svg class="w-16 h-16 mr-4 text-invisible"><use xlink:href="#Add-one"></use></svg>{_("Not Translated")}</span>'
+            )
         if value == self.TRANSLATION_INCOMPLETE:
-            return f'<span class="badge badge-simple badge-warning"><svg class="w-16 h-16 mr-4 text-warning"><use xlink:href="#Attention"></use></svg>{_("Incomplete")}</span>'
+            return mark_safe(
+                f'<span class="badge badge-simple badge-warning"><svg class="w-16 h-16 mr-4 text-warning"><use xlink:href="#Attention"></use></svg>{_("Incomplete")}</span>'
+            )
         if value == self.TRANSLATION_TRANSLATED:
-            return f'<span class="badge badge-simple badge-positive"><svg class="w-16 h-16 mr-4 text-success"><use xlink:href="#Check"></use></svg>{_("Translated")}</span>'
+            return mark_safe(
+                f'<span class="badge badge-simple badge-positive"><svg class="w-16 h-16 mr-4 text-success"><use xlink:href="#Check"></use></svg>{_("Translated")}</span>'
+            )
 
     def get_translated_fields(self):
         return SBAdminTranslationsService.get_translated_fields_for_model(self.model)