From 997c59ac76dbcd012002a9505cb7498b9027436d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timotej=20Sini=C4=8D=C3=A1k?= Date: Wed, 10 Dec 2025 11:21:37 +0100 Subject: [PATCH 1/5] add_verbose for list add button --- src/django_smartbase_admin/engine/admin_base_view.py | 1 + src/django_smartbase_admin/templates/sb_admin/actions/list.html | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/django_smartbase_admin/engine/admin_base_view.py b/src/django_smartbase_admin/engine/admin_base_view.py index b8296ae1..49c88f64 100644 --- a/src/django_smartbase_admin/engine/admin_base_view.py +++ b/src/django_smartbase_admin/engine/admin_base_view.py @@ -690,6 +690,7 @@ def action_list( { "content_context": data, "model_name": self.model._meta.verbose_name, + "add_verbose": getattr(self.model, "add_verbose", False), "list_title": self.model._meta.verbose_name_plural, } ) diff --git a/src/django_smartbase_admin/templates/sb_admin/actions/list.html b/src/django_smartbase_admin/templates/sb_admin/actions/list.html index 77733201..f5e7fb44 100644 --- a/src/django_smartbase_admin/templates/sb_admin/actions/list.html +++ b/src/django_smartbase_admin/templates/sb_admin/actions/list.html @@ -88,7 +88,7 @@

- {% trans 'Add' %} {{ model_name }} + {% trans 'Add' %}{% if add_verbose %} {{ add_verbose }} {% else %} {{ model_name }} {% endif %} {% endif %} From 948827c5785d9310cfff6f204a6039864e99c37e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timotej=20Sini=C4=8D=C3=A1k?= Date: Wed, 10 Dec 2025 13:04:49 +0100 Subject: [PATCH 2/5] triv(dashboar): #dev_ts - move add_label to admin_base_view --- src/django_smartbase_admin/engine/admin_base_view.py | 2 +- src/django_smartbase_admin/templates/sb_admin/actions/list.html | 2 +- .../templates/sb_admin/includes/change_form_title.html | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/django_smartbase_admin/engine/admin_base_view.py b/src/django_smartbase_admin/engine/admin_base_view.py index 49c88f64..93d88eac 100644 --- a/src/django_smartbase_admin/engine/admin_base_view.py +++ b/src/django_smartbase_admin/engine/admin_base_view.py @@ -228,6 +228,7 @@ def get_global_context( "view_id": self.get_id(), "configuration": request.request_data.configuration, "request_data": request.request_data, + "add_label": getattr(self, "add_label", False), "DETAIL_STRUCTURE_RIGHT_CLASS": DETAIL_STRUCTURE_RIGHT_CLASS, "OVERRIDE_CONTENT_OF_NOTIFICATION": OVERRIDE_CONTENT_OF_NOTIFICATION, "username_data": self.get_username_data(request), @@ -690,7 +691,6 @@ def action_list( { "content_context": data, "model_name": self.model._meta.verbose_name, - "add_verbose": getattr(self.model, "add_verbose", False), "list_title": self.model._meta.verbose_name_plural, } ) diff --git a/src/django_smartbase_admin/templates/sb_admin/actions/list.html b/src/django_smartbase_admin/templates/sb_admin/actions/list.html index f5e7fb44..bf7a6b44 100644 --- a/src/django_smartbase_admin/templates/sb_admin/actions/list.html +++ b/src/django_smartbase_admin/templates/sb_admin/actions/list.html @@ -88,7 +88,7 @@

- {% trans 'Add' %}{% if add_verbose %} {{ add_verbose }} {% else %} {{ model_name }} {% endif %} + {% trans 'Add' %}{% if add_label %} {{ add_label }}{% endif %} {% endif %} diff --git a/src/django_smartbase_admin/templates/sb_admin/includes/change_form_title.html b/src/django_smartbase_admin/templates/sb_admin/includes/change_form_title.html index fa64ceea..18001eb1 100644 --- a/src/django_smartbase_admin/templates/sb_admin/includes/change_form_title.html +++ b/src/django_smartbase_admin/templates/sb_admin/includes/change_form_title.html @@ -1,7 +1,7 @@ {% load i18n %} {% if add %} - {% blocktrans with name=opts.verbose_name %}Add {{ name }}{% endblocktrans %} + {% trans 'Add' %}{% if add_label %} {{ add_label }}{% endif %} {% else %} {{ original|truncatewords:"18" }} {% endif %} \ No newline at end of file From 4a7a98496316cf7b064985e9857beeb27d3ad968 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timotej=20Sini=C4=8D=C3=A1k?= Date: Wed, 10 Dec 2025 13:48:38 +0100 Subject: [PATCH 3/5] triv(dashboar): #dev_ts - default add_label to admin_base_view --- src/django_smartbase_admin/engine/admin_base_view.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/django_smartbase_admin/engine/admin_base_view.py b/src/django_smartbase_admin/engine/admin_base_view.py index 93d88eac..6bae2503 100644 --- a/src/django_smartbase_admin/engine/admin_base_view.py +++ b/src/django_smartbase_admin/engine/admin_base_view.py @@ -64,6 +64,7 @@ class SBAdminBaseView(object): global_filter_data_map = None field_cache = None sbadmin_detail_actions = None + add_label = None delete_confirmation_template = "sb_admin/actions/delete_confirmation.html" def init_view_static(self, configuration, model, admin_site): @@ -228,7 +229,7 @@ def get_global_context( "view_id": self.get_id(), "configuration": request.request_data.configuration, "request_data": request.request_data, - "add_label": getattr(self, "add_label", False), + "add_label": self.add_label, "DETAIL_STRUCTURE_RIGHT_CLASS": DETAIL_STRUCTURE_RIGHT_CLASS, "OVERRIDE_CONTENT_OF_NOTIFICATION": OVERRIDE_CONTENT_OF_NOTIFICATION, "username_data": self.get_username_data(request), From 4c28181ae4cede36e7f6619c85e3cec54d7f92ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timotej=20Sini=C4=8D=C3=A1k?= Date: Wed, 10 Dec 2025 14:09:53 +0100 Subject: [PATCH 4/5] triv(dashboar): #dev_ts - default add_label to admin_base_view --- src/django_smartbase_admin/engine/admin_base_view.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/django_smartbase_admin/engine/admin_base_view.py b/src/django_smartbase_admin/engine/admin_base_view.py index 6bae2503..cbe1ae32 100644 --- a/src/django_smartbase_admin/engine/admin_base_view.py +++ b/src/django_smartbase_admin/engine/admin_base_view.py @@ -222,6 +222,9 @@ def get_color_scheme_context(self, request): "color_scheme_form": color_scheme_form, } + def get_add_label(self, request, object_id: int | str | None = None): + return self.add_label + def get_global_context( self, request, object_id: int | str | None = None ) -> dict[str, Any]: @@ -229,7 +232,7 @@ def get_global_context( "view_id": self.get_id(), "configuration": request.request_data.configuration, "request_data": request.request_data, - "add_label": self.add_label, + "add_label": self.get_add_label(request, object_id), "DETAIL_STRUCTURE_RIGHT_CLASS": DETAIL_STRUCTURE_RIGHT_CLASS, "OVERRIDE_CONTENT_OF_NOTIFICATION": OVERRIDE_CONTENT_OF_NOTIFICATION, "username_data": self.get_username_data(request), From 883cada1c5a8ca927db12b6dcfaf13a2debbeb6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timotej=20Sini=C4=8D=C3=A1k?= Date: Wed, 10 Dec 2025 14:16:25 +0100 Subject: [PATCH 5/5] upgrade version --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 25b8651d..70ee6876 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "django-smartbase-admin" -version = "1.0.35" +version = "1.0.36" description = "" authors = ["SmartBase "] readme = "README.md"