From dfe037c45e5d81e3c9f1f66920097256563c786f Mon Sep 17 00:00:00 2001 From: hoang Date: Thu, 15 May 2025 15:15:08 +0700 Subject: [PATCH 1/3] Add the farm generator to the breadcrumb template tag We add the farm generator to the breadcrumb template tag to create breadcrumbs for pages associated with a Farm instance. --- promgen/templatetags/promgen.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/promgen/templatetags/promgen.py b/promgen/templatetags/promgen.py index 3a1c2c157..92a79910d 100644 --- a/promgen/templatetags/promgen.py +++ b/promgen/templatetags/promgen.py @@ -155,6 +155,10 @@ def sender(obj): if obj.content_type.model == "project": yield from project(obj.content_object) + def farm(obj): + yield reverse("farm-list"), _("Farms") + yield obj.get_absolute_url(), obj.name + def generator(): yield reverse("home"), _("Home") if isinstance(instance, models.Sender): @@ -169,6 +173,8 @@ def generator(): yield from rule(instance) if isinstance(instance, models.Alert): yield from alert(instance) + if isinstance(instance, models.Farm): + yield from farm(instance) def to_tag(): yield '
    ' From 736ba719d59ff05f26be3e6b7fb579b68eb371eb Mon Sep 17 00:00:00 2001 From: hoang Date: Thu, 15 May 2025 15:18:41 +0700 Subject: [PATCH 2/3] Add the v-pre tag to the breadcrumb template tag We included v-pre in the breadcrumb template tag to ensure that every breadcrumb generated by this template tag in Promgen contains the v-pre element. --- promgen/templatetags/promgen.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/promgen/templatetags/promgen.py b/promgen/templatetags/promgen.py index 92a79910d..a0d001d6d 100644 --- a/promgen/templatetags/promgen.py +++ b/promgen/templatetags/promgen.py @@ -177,7 +177,7 @@ def generator(): yield from farm(instance) def to_tag(): - yield '
      ' + yield '
        ' for href, text in generator(): yield format_html('
      1. {}
        2. ', mark_safe(href), text) if label: From 2224c3b70ecae44c6c4ea84f9c232710f2041823 Mon Sep 17 00:00:00 2001 From: hoang Date: Thu, 15 May 2025 15:24:05 +0700 Subject: [PATCH 3/3] Reuse the breadcrumb template tag everywhere We reuse the breadcrumb template tag everywhere to standardize the generation of a page's breadcrumb in Promgen. This also helps fix errors on some pages of Promgen that the Home link in the breadcrumb is redirected to the Services page instead of the Home page. --- promgen/templates/promgen/farm_detail.html | 7 ++----- promgen/templates/promgen/farm_duplicate.html | 6 ++---- promgen/templates/promgen/farm_form.html | 8 ++------ promgen/templates/promgen/host_404.html | 6 ++---- promgen/templates/promgen/host_detail.html | 6 ++---- promgen/templates/promgen/host_form.html | 8 ++------ promgen/templates/promgen/host_list.html | 7 +++---- promgen/templates/promgen/import_form.html | 6 ++---- promgen/templates/promgen/link_farm.html | 8 ++------ promgen/templates/promgen/rule_import.html | 6 ++---- promgen/templates/promgen/rule_list.html | 5 +---- promgen/templates/promgen/search.html | 6 ++---- promgen/templates/promgen/url_form.html | 8 ++------ 13 files changed, 26 insertions(+), 61 deletions(-) diff --git a/promgen/templates/promgen/farm_detail.html b/promgen/templates/promgen/farm_detail.html index 9bcbb661c..a231b51d5 100644 --- a/promgen/templates/promgen/farm_detail.html +++ b/promgen/templates/promgen/farm_detail.html @@ -1,5 +1,6 @@ {% extends "base.html" %} {% load i18n %} +{% load promgen %} {% block content %} @@ -12,11 +13,7 @@

        -
          -
        1. Home
          2. -
        2. Farms
          3. -
        3. {{ farm.name }}
          4. -
        +{% breadcrumb farm %}
        diff --git a/promgen/templates/promgen/farm_duplicate.html b/promgen/templates/promgen/farm_duplicate.html index 3122d40a8..204d0b3c7 100644 --- a/promgen/templates/promgen/farm_duplicate.html +++ b/promgen/templates/promgen/farm_duplicate.html @@ -1,11 +1,9 @@ {% extends "base.html" %} +{% load promgen %} {% block content %} -
          -
        1. Home
          2. -
        2. Convert Farm
          3. -
        +{% breadcrumb label="Convert Farm" %}
        Error converting farm. Duplicate detected
        diff --git a/promgen/templates/promgen/farm_form.html b/promgen/templates/promgen/farm_form.html index c58118cd5..74686f0d8 100644 --- a/promgen/templates/promgen/farm_form.html +++ b/promgen/templates/promgen/farm_form.html @@ -1,4 +1,5 @@ {% extends "base.html" %} +{% load promgen %} {% block content %} @@ -6,12 +7,7 @@

        Project: {{ project.name }}

        -
          -
        1. Home
          2. -
        2. {{ project.service.name }}
          3. -
        3. {{ project.name }}
          4. -
        4. {{ view.button_label }}
          5. -
        +{% breadcrumb project view.button_label %}
        {% csrf_token %} {{ form.as_p }} diff --git a/promgen/templates/promgen/host_404.html b/promgen/templates/promgen/host_404.html index 13dca555e..6c383d72d 100644 --- a/promgen/templates/promgen/host_404.html +++ b/promgen/templates/promgen/host_404.html @@ -1,4 +1,5 @@ {% extends "base.html" %} +{% load promgen %} {% block title %}No hosts found for {{ slug }}{% endblock %} @@ -7,10 +8,7 @@

        Host: {{ slug }}

        -
          -
        1. Home
          2. -
        2. {{ slug }}
          3. -
        +{% breadcrumb label=slug %}