From 4554dbdf4f4f3acde96becef7c6b0c8503993ac5 Mon Sep 17 00:00:00 2001 From: Sage Abdullah Date: Fri, 15 Dec 2023 11:05:21 +0000 Subject: [PATCH] Rename main_actions and more_actions to header_buttons and header_more_buttons To follow the pattern for get_list_buttons and get_list_more_buttons This will be made clearer in the next commit --- .../templates/wagtailadmin/generic/base.html | 22 +++++++++---------- wagtail/admin/views/generic/base.py | 16 +++++++------- wagtail/admin/views/generic/history.py | 3 ++- wagtail/admin/views/generic/models.py | 20 +++++++++-------- wagtail/admin/views/generic/usage.py | 3 ++- 5 files changed, 34 insertions(+), 30 deletions(-) diff --git a/wagtail/admin/templates/wagtailadmin/generic/base.html b/wagtail/admin/templates/wagtailadmin/generic/base.html index e2c574ce3e2..90e049e8a40 100644 --- a/wagtail/admin/templates/wagtailadmin/generic/base.html +++ b/wagtail/admin/templates/wagtailadmin/generic/base.html @@ -9,23 +9,23 @@ {% block slim_header %} {% if breadcrumbs_items %} {% fragment stripped as actions %} - {% block main_actions %} - {% for action in main_actions %} - - {% icon name=action.icon_name %} + {% block header_buttons %} + {% for button in header_buttons %} + + {% icon name=button.icon_name %} {% endfor %} {% endblock %} - {% block more_actions %} - {% if more_actions %} + {% block header_more_buttons %} + {% if header_more_buttons %} {% trans "Actions" as actions_toggle_title %} {% dropdown toggle_icon="dots-horizontal" toggle_aria_label=actions_toggle_title toggle_classname="w-p-0 w-w-10 w-h-slim-header hover:w-scale-110 w-transition w-outline-offset-inside w-relative w-z-30" toggle_tooltip_offset="[0, -2]" %} - {% for action in more_actions %} - - {% if action.icon_name %} - {% icon name=action.icon_name %} + {% for button in header_more_buttons %} + + {% if button.icon_name %} + {% icon name=button.icon_name %} {% endif %} - {{ action.label }} + {{ button.label }} {% endfor %} {% enddropdown %} diff --git a/wagtail/admin/views/generic/base.py b/wagtail/admin/views/generic/base.py index 545e9eb455b..745c95cc992 100644 --- a/wagtail/admin/views/generic/base.py +++ b/wagtail/admin/views/generic/base.py @@ -26,8 +26,8 @@ class WagtailAdminTemplateMixin(TemplateResponseMixin, ContextMixin): _show_breadcrumbs = False breadcrumbs_items = [{"url": reverse_lazy("wagtailadmin_home"), "label": _("Home")}] template_name = "wagtailadmin/generic/base.html" - main_actions = [] - more_actions = [] + header_buttons = [] + header_more_buttons = [] def get_page_title(self): return self.page_title @@ -48,11 +48,11 @@ def get_header_icon(self): def get_breadcrumbs_items(self): return self.breadcrumbs_items - def get_main_actions(self): - return self.main_actions + def get_header_buttons(self): + return self.header_buttons - def get_more_actions(self): - return self.more_actions + def get_header_more_buttons(self): + return self.header_more_buttons def get_context_data(self, **kwargs): context = super().get_context_data(**kwargs) @@ -68,8 +68,8 @@ def get_context_data(self, **kwargs): context["breadcrumbs_items"] = None if self._show_breadcrumbs: context["breadcrumbs_items"] = self.get_breadcrumbs_items() - context["main_actions"] = self.get_main_actions() - context["more_actions"] = self.get_more_actions() + context["header_buttons"] = self.get_header_buttons() + context["header_more_buttons"] = self.get_header_more_buttons() return context def get_template_names(self): diff --git a/wagtail/admin/views/generic/history.py b/wagtail/admin/views/generic/history.py index 1e40d1a826b..3f98bf01e10 100644 --- a/wagtail/admin/views/generic/history.py +++ b/wagtail/admin/views/generic/history.py @@ -100,7 +100,8 @@ def get_breadcrumbs_items(self): }, ] - def get_main_actions(self): + @cached_property + def header_buttons(self): return [ Button( label=gettext("Edit"), diff --git a/wagtail/admin/views/generic/models.py b/wagtail/admin/views/generic/models.py index b2ebd6fe637..5903fcd7ca4 100644 --- a/wagtail/admin/views/generic/models.py +++ b/wagtail/admin/views/generic/models.py @@ -384,31 +384,33 @@ def get_breadcrumbs_items(self): {"url": "", "label": capfirst(self.model._meta.verbose_name_plural)}, ] - def get_main_actions(self): - actions = [] + @cached_property + def header_buttons(self): + buttons = [] if not self.permission_policy or self.permission_policy.user_has_permission( self.request.user, "add" ): - actions.append( + buttons.append( Button( self.add_item_label, url=self.get_add_url(), icon_name="plus", ) ) - return actions + return buttons - def get_more_actions(self): - actions = [] + @cached_property + def header_more_buttons(self): + buttons = [] if self.list_export: - actions.append( + buttons.append( Button( _("Download XLSX"), url=self.xlsx_export_url, icon_name="download", ) ) - actions.append( + buttons.append( Button( _("Download CSV"), url=self.csv_export_url, @@ -416,7 +418,7 @@ def get_more_actions(self): ) ) - return actions + return buttons def get_translations(self): index_url = self.get_index_url() diff --git a/wagtail/admin/views/generic/usage.py b/wagtail/admin/views/generic/usage.py index 4499883788d..cc9b2a71cd5 100644 --- a/wagtail/admin/views/generic/usage.py +++ b/wagtail/admin/views/generic/usage.py @@ -68,7 +68,8 @@ def get_breadcrumbs_items(self): ) return self.breadcrumbs_items + items - def get_main_actions(self): + @cached_property + def header_buttons(self): return [ Button( label=_("Edit"),