django-smartbase-admin 1.0.6b2__tar.gz → 1.0.6b3__tar.gz

{django_smartbase_admin-1.0.6b2 → django_smartbase_admin-1.0.6b3}/PKG-INFO

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

{django_smartbase_admin-1.0.6b2 → django_smartbase_admin-1.0.6b3}/pyproject.toml

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

{django_smartbase_admin-1.0.6b2 → django_smartbase_admin-1.0.6b3}/src/django_smartbase_admin/admin/admin_base.py

@@ -195,7 +195,7 @@ class SBAdminFormFieldWidgetsMixin:
         )
 
     def get_autocomplete_widget(
-            self, request, form_field, db_field, model, multiselect=False
+        self, request, form_field, db_field, model, multiselect=False
     ):
         return request.request_data.configuration.get_autocomplete_widget(
             self, request, form_field, db_field, model, multiselect
@@ -286,7 +286,7 @@ class SBAdminFormFieldWidgetsMixin:
             )
             form_field.widget = form_field_widget_instance
             if form_field.help_text == _(
-                    "Hold down “Control”, or “Command” on a Mac, to select more than one."
+                "Hold down “Control”, or “Command” on a Mac, to select more than one."
             ):
                 form_field.help_text = ""
         return form_field
@@ -367,25 +367,25 @@ if parler_enabled:
                     for translations_model in form_model._parler_meta.get_all_models():
                         fields = getattr(form_new_meta, "fields", form_meta.fields)
                         exclude = (
-                                getattr(form_new_meta, "exclude", form_meta.exclude) or ()
+                            getattr(form_new_meta, "exclude", form_meta.exclude) or ()
                         )
                         widgets = (
-                                getattr(form_new_meta, "widgets", form_meta.widgets) or ()
+                            getattr(form_new_meta, "widgets", form_meta.widgets) or ()
                         )
                         labels = (
-                                getattr(form_new_meta, "labels", form_meta.labels) or ()
+                            getattr(form_new_meta, "labels", form_meta.labels) or ()
                         )
                         help_texts = (
-                                getattr(form_new_meta, "help_texts", form_meta.help_texts)
-                                or ()
+                            getattr(form_new_meta, "help_texts", form_meta.help_texts)
+                            or ()
                         )
                         error_messages = (
-                                getattr(
-                                    form_new_meta,
-                                    "error_messages",
-                                    form_meta.error_messages,
-                                )
-                                or ()
+                            getattr(
+                                form_new_meta,
+                                "error_messages",
+                                form_meta.error_messages,
+                            )
+                            or ()
                         )
                         formfield_callback = attrs.get("formfield_callback", None)
 
@@ -406,10 +406,10 @@ if parler_enabled:
                             # The next code holds the same logic as fields_for_model()
                             # The f.editable check happens in _get_model_form_field()
                             elif (
-                                    f_name not in form_base_fields
-                                    and (fields is None or f_name in fields)
-                                    and f_name not in exclude
-                                    and not f_name in attrs
+                                f_name not in form_base_fields
+                                and (fields is None or f_name in fields)
+                                and f_name not in exclude
+                                and not f_name in attrs
                             ):
                                 # Get declared widget kwargs
                                 if f_name in widgets:
@@ -430,7 +430,7 @@ if parler_enabled:
                                 # See if this formfield was previously defined using a TranslatedField placeholder.
                                 placeholder = _get_mro_attribute(bases, f_name)
                                 if placeholder and isinstance(
-                                        placeholder, TranslatedField
+                                    placeholder, TranslatedField
                                 ):
                                     kwargs.update(placeholder.kwargs)
 
@@ -463,7 +463,6 @@ if parler_enabled:
                     mcs.parler_orig__new__(mcs, name, bases, attrs)
             return super().__new__(mcs, name, bases, attrs)
 
-
     class SBTranslatableModelForm(
         BaseTranslatableModelForm,
         SBAdminBaseForm,
@@ -514,7 +513,7 @@ class SBAdminInlineAndAdminCommon(SBAdminFormFieldWidgetsMixin):
     def init_view_dynamic(self, request, request_data=None, **kwargs) -> None:
         if SBAdminTranslationsService.is_translated_model(self.model):
             has_default_form = (
-                    self.form == TranslatableModelForm or self.form == forms.ModelForm
+                self.form == TranslatableModelForm or self.form == forms.ModelForm
             )
             if not self.form or has_default_form:
                 self.form = SBTranslatableModelForm
@@ -568,12 +567,12 @@ class SBAdminThirdParty(SBAdminInlineAndAdminCommon, SBAdminBaseView):
 
 class SBAdminTranslationStatusMixin:
     def sbadmin_translation_status_row_context(
-            self,
-            language,
-            languages_count,
-            main_language_code,
-            current_lang_code,
-            translations_edit_url,
+        self,
+        language,
+        languages_count,
+        main_language_code,
+        current_lang_code,
+        translations_edit_url,
     ) -> dict[str, Any]:
         language_code = language[0]
         language_title = language[1]
@@ -665,7 +664,9 @@ class SBAdminInlineFormSetMixin:
         if view and view.parent_model and view.opts:
             parent_opts = view.parent_model._meta
             opts = view.opts
-            modal_prefix = "modal__" if is_modal(SBAdminThreadLocalService.get_request()) else ""
+            modal_prefix = (
+                "modal_" if is_modal(SBAdminThreadLocalService.get_request()) else ""
+            )
             return f"{modal_prefix}{parent_opts.app_label}_{parent_opts.model_name}_{opts.app_label}-{opts.model_name}"
 
         return super().get_default_prefix()
@@ -723,7 +724,7 @@ class SBAdmin(
         return self.get_model_path()
 
     def get_sbadmin_fieldsets(
-            self, request, object_id=None
+        self, request, object_id=None
     ) -> Iterable[tuple[str | None, dict[str, Any]]]:
         fieldsets = self.sbadmin_fieldsets or self.fieldsets
         if fieldsets:
@@ -737,7 +738,7 @@ class SBAdmin(
         self.get_form(request)()
 
     def get_fieldsets(
-            self, request, obj=None
+        self, request, obj=None
     ) -> list[tuple[str | None, dict[str, Any]]]:
         fieldsets = []
         object_id = obj.id if obj else None
@@ -754,7 +755,7 @@ class SBAdmin(
         return fieldsets
 
     def get_fieldsets_context(
-            self, request, object_id
+        self, request, object_id
     ) -> dict[str, dict[str | None, dict[str, Any]]]:
         fielsets_context = {}
         for fieldset in self.get_sbadmin_fieldsets(request, object_id):
@@ -970,7 +971,9 @@ class SBAdmin(
         parent_pk = request.POST.get(SBADMIN_PARENT_INSTANCE_PK_VAR)
 
         if parent_model_path and parent_pk:
-            app_label, model_name, field, parent_model = parent_model_path.split("_", 4)
+            prefix, app_label, model_name, field, parent_model = (
+                parent_model_path.split("_", 5)
+            )
             content_type = ContentType.objects.get(
                 app_label=app_label, model=parent_model
             )
@@ -1041,7 +1044,7 @@ class SBAdminInline(
 
     def get_context_data(self, request) -> dict[str, Any]:
         is_sortable_active: bool = self.sortable_field_name and (
-                self.has_add_permission(request) or self.has_change_permission(request)
+            self.has_add_permission(request) or self.has_change_permission(request)
         )
         add_url = None
         try:

{django_smartbase_admin-1.0.6b2 → django_smartbase_admin-1.0.6b3}/src/django_smartbase_admin/admin/widgets.py

@@ -70,7 +70,7 @@ class SBAdminBaseWidget(ContextMixin):
         modal_prefix = ""
         try:
             modal_prefix = (
-                "modal__" if is_modal(SBAdminThreadLocalService.get_request()) else ""
+                "modal_" if is_modal(SBAdminThreadLocalService.get_request()) else ""
             )
         except:
             pass

{django_smartbase_admin-1.0.6b2 → django_smartbase_admin-1.0.6b3}/src/django_smartbase_admin/templates/sb_admin/actions/change_form.html

@@ -111,7 +111,7 @@
 
     {% block form %}
         <form {% if has_file_field %}enctype="multipart/form-data" {% endif %}action="{{ form_url }}" method="post"
-              id="{% if sbadmin_is_modal %}modal__{% endif %}{{ opts.model_name }}_form" class="detail-view-form flex-grow flex flex-col w-full max-w-1180 mx-auto" novalidate>
+              id="{% if sbadmin_is_modal %}modal_{% endif %}{{ opts.model_name }}_form" class="detail-view-form flex-grow flex flex-col w-full max-w-1180 mx-auto" novalidate>
         <div class=" {% if sbadmin_is_modal %}max-h-[70vh] overflow-y-auto sbadmin_is_modal realative flex-grow{% endif %}">
             {% csrf_token %}
             {% if errors %}
@@ -136,8 +136,8 @@
                     {% for tab, tab_content_object in tabular_context.context.items %}
                         <li role="presentation">
                             <button class="relative{% for class in tab_content_object.classes %} {{ class }}{% endfor %}" id="tab_{{ tab|slugify }}" data-bs-toggle="tab"
-                                    data-bs-target="#{% if sbadmin_is_modal %}modal__{% endif %}{{ opts.model_name }}_tabcontent_{{ tab|slugify }}" type="button" role="tab"
-                                    aria-controls="{% if sbadmin_is_modal %}modal__{% endif %}{{ opts.model_name }}_tabcontent_{{ tab|slugify }}" aria-selected="true">
+                                    data-bs-target="#{% if sbadmin_is_modal %}modal_{% endif %}{{ opts.model_name }}_tabcontent_{{ tab|slugify }}" type="button" role="tab"
+                                    aria-controls="{% if sbadmin_is_modal %}modal_{% endif %}{{ opts.model_name }}_tabcontent_{{ tab|slugify }}" aria-selected="true">
                                 {{ tab }}
                             </button>
                         </li>
@@ -145,7 +145,7 @@
                 </ul>
             {% endif %}
             {% for tab, tab_content_object in tabular_context.context.items %}
-                <div class="detail-view-tab tab-pane fade{% for class in tab_content_object.classes %} {{ class }}{% endfor %} pt-20" id="{% if sbadmin_is_modal %}modal__{% endif %}{{ opts.model_name }}_tabcontent_{{ tab|slugify }}" role="tabpanel"
+                <div class="detail-view-tab tab-pane fade{% for class in tab_content_object.classes %} {{ class }}{% endfor %} pt-20" id="{% if sbadmin_is_modal %}modal_{% endif %}{{ opts.model_name }}_tabcontent_{{ tab|slugify }}" role="tabpanel"
                      aria-labelledby="tab_{{ tab|slugify }}">
                     <div class="flex max-md:flex-wrap w-full lg:gap-24">
                         <div class="min-w-0 w-full">
@@ -206,7 +206,7 @@
                         {% url opts|admin_urlname:'add' as post_url %}
                     {% endif %}
                     <button
-                            form="{% if sbadmin_is_modal %}modal__{% endif %}{{ opts.model_name }}_form"
+                            form="{% if sbadmin_is_modal %}modal_{% endif %}{{ opts.model_name }}_form"
                             hx-post="{{ post_url }}"
                             hx-target="#sb-admin-modal .modal-content"
                             hx-swap="innerHTML"

{django_smartbase_admin-1.0.6b2 → django_smartbase_admin-1.0.6b3}/src/django_smartbase_admin/templates/sb_admin/inlines/table_inline.html

@@ -29,7 +29,7 @@
                                         class="btn btn-icon ml-auto {{ inline_admin_formset.handler_classes|join:" " }}"
                                         data-bs-toggle="modal"
                                         data-bs-target="#sb-admin-modal"
-                                        hx-get="{{ context_data.add_url }}?_popup=1&sbadmin_is_modal=1&sbadmin_reload_on_save=1&sbadmin_parent_instance_field={{ context_data.parent_data.sbadmin_parent_instance_field }}&sbadmin_parent_instance_pk={{ context_data.parent_data.sbadmin_parent_instance_pk }}&sbadmin_parent_instance_label={{ context_data.parent_data.sbadmin_parent_instance_label }}"
+                                        hx-get="{{ context_data.add_url }}?_popup=1&sbadmin_is_modal=1&sbadmin_reload_on_save=1&sbadmin_parent_instance_field=modal_{{ context_data.parent_data.sbadmin_parent_instance_field }}&sbadmin_parent_instance_pk={{ context_data.parent_data.sbadmin_parent_instance_pk }}&sbadmin_parent_instance_label={{ context_data.parent_data.sbadmin_parent_instance_label }}"
                                         hx-target="#sb-admin-modal .modal-content"
                                         hx-swap="innerHTML"
                                 >