nautobot 2.4.13__py3-none-any.whl → 2.4.14__py3-none-any.whl

nautobot/extras/filters/mixins.py

@@ -74,7 +74,9 @@ class CustomFieldModelFilterSetMixin(django_filters.FilterSet):
             CustomFieldTypeChoices.TYPE_SELECT: CustomFieldSelectFilter,
         }
 
-        custom_fields = CustomField.objects.get_for_model(self._meta.model, exclude_filter_disabled=True)
+        custom_fields = CustomField.objects.get_for_model(
+            self._meta.model, exclude_filter_disabled=True, get_queryset=False
+        )
         for cf in custom_fields:
             # Determine filter class for this CustomField type, default to CustomFieldCharFilter
             new_filter_name = cf.add_prefix_to_cf_key()
@@ -220,13 +222,13 @@ class RelationshipModelFilterSetMixin(django_filters.FilterSet):
         """
         Append form fields for all Relationships assigned to this model.
         """
-        src_relationships, dst_relationships = Relationship.objects.get_for_model(model=model, hidden=False)
+        src_relationships, dst_relationships = Relationship.objects.get_for_model(
+            model=model, hidden=False, get_queryset=False
+        )
 
-        for rel in src_relationships:
-            self._append_relationships_side([rel], RelationshipSideChoices.SIDE_SOURCE, model)
+        self._append_relationships_side(src_relationships, RelationshipSideChoices.SIDE_SOURCE, model)
 
-        for rel in dst_relationships:
-            self._append_relationships_side([rel], RelationshipSideChoices.SIDE_DESTINATION, model)
+        self._append_relationships_side(dst_relationships, RelationshipSideChoices.SIDE_DESTINATION, model)
 
     def _append_relationships_side(self, relationships, initial_side, model):
         """

nautobot/extras/forms/forms.py

@@ -197,6 +197,7 @@ __all__ = (
     "SecretFilterForm",
     "SecretForm",
     "SecretsGroupAssociationFormSet",
+    "SecretsGroupBulkEditForm",
     "SecretsGroupFilterForm",
     "SecretsGroupForm",
     "StaticGroupAssociationFilterForm",
@@ -2082,6 +2083,14 @@ class RoleFilterForm(NautobotFilterForm):
 #
 
 
+class SecretsGroupBulkEditForm(NautobotBulkEditForm):
+    pk = forms.ModelMultipleChoiceField(queryset=SecretsGroup.objects.all(), widget=forms.MultipleHiddenInput())
+    description = forms.CharField(max_length=CHARFIELD_MAX_LENGTH, required=False)
+
+    class Meta:
+        model = SecretsGroup
+
+
 def provider_choices():
     return sorted([(slug, provider.name) for slug, provider in registry["secrets_providers"].items()])
 

nautobot/extras/forms/mixins.py

@@ -95,7 +95,7 @@ class CustomFieldModelFilterFormMixin(forms.Form):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
 
-        custom_fields = CustomField.objects.get_for_model(self.model, exclude_filter_disabled=True)
+        custom_fields = CustomField.objects.get_for_model(self.model, exclude_filter_disabled=True, get_queryset=False)
         self.custom_fields = []
         for cf in custom_fields:
             field_name = cf.add_prefix_to_cf_key()
@@ -714,7 +714,9 @@ class RelationshipModelFilterFormMixin(forms.Form):
         """
         Append form fields for all Relationships assigned to this model.
         """
-        src_relationships, dst_relationships = Relationship.objects.get_for_model(model=self.model, hidden=False)
+        src_relationships, dst_relationships = Relationship.objects.get_for_model(
+            model=self.model, hidden=False, get_queryset=False
+        )
 
         for rel in src_relationships:
             self._append_relationships_side([rel], RelationshipSideChoices.SIDE_SOURCE)

nautobot/extras/migrations/0062_collect_roles_from_related_apps_roles.py

@@ -1,7 +1,6 @@
 # Generated by Django 3.2.16 on 2022-11-19 23:15
 
 from collections import namedtuple
-import logging
 
 from django.db import migrations, models
 
@@ -24,8 +23,6 @@ color_map = {
     "success": ColorChoices.COLOR_GREEN,
 }
 
-logger = logging.getLogger(__name__)
-
 
 def create_equivalent_roles_of_virtualmachine_device_role(apps):
     """Create equivalent roles for the VirtualMachine DeviceRole."""
@@ -82,17 +79,43 @@ def create_roles(apps, roles_to_create, content_types):
                 "description": old_role.description,
                 "color": getattr(old_role, "color", color_map["default"]),
                 "weight": getattr(old_role, "weight", None),
+                "_custom_field_data": getattr(old_role, "_custom_field_data", {}),
             },
         )
         if created:
-            logger.info(f'Created Role "{new_role.name}"')
+            print(f"    Created Role {new_role.name!r}")
+        else:
+            updated = False
+            # Fix up in the case of overlapping roles
+            if new_role.weight is None and hasattr(old_role, "weight"):
+                new_role.weight = old_role.weight
+                updated = True
+            if old_role.description and not new_role.description:
+                new_role.description = old_role.description
+                updated = True
+            if hasattr(old_role, "_custom_field_data"):
+                for field, value in old_role._custom_field_data.items():
+                    if field in new_role._custom_field_data:
+                        if new_role._custom_field_data[field] != value:
+                            print(
+                                f"    Value conflict for custom field {field!r} for role {new_role.name!r} - DATA LOSS"
+                            )
+                    else:
+                        new_role._custom_field_data[field] = value
+                        updated = True
+            if updated:
+                print(f"    Updated Role {new_role.name!r}")
+                new_role.save()
+            else:
+                print(f"    No changes to already-created Role {new_role.name!r}")
+
         if old_role_ct and hasattr(old_role, "pk"):
             # Move over existing object change records to the new role we created
             updated_count = ObjectChange.objects.filter(
                 changed_object_type=old_role_ct, changed_object_id=old_role.pk
             ).update(changed_object_type=new_role_ct, changed_object_id=new_role.pk)
-            logger.info(
-                f'Updated {updated_count} ObjectChanges from the existing "{old_role.name}" {old_role._meta.label}'
+            print(
+                f"    Updated {updated_count} ObjectChanges from the existing {old_role.name!r} {old_role._meta.label}"
             )
 
     # This is for all of the change records for roles which no longer exist
@@ -100,7 +123,7 @@ def create_roles(apps, roles_to_create, content_types):
         updated_count = ObjectChange.objects.filter(changed_object_type=old_role_ct).update(
             changed_object_type=new_role_ct
         )
-        logger.info(f"Updated {updated_count} leftover ObjectChanges from deleted {old_role_ct.model} records.")
+        print(f"    Updated {updated_count} leftover ObjectChanges from deleted {old_role_ct.model} records.")
 
     roles = Role.objects.filter(name__in=[roles.name for roles in roles_to_create])
 

nautobot/extras/migrations/0124_add_joblogentry_index.py

@@ -0,0 +1,16 @@
+# Generated by Django 4.2.23 on 2025-07-31 23:49
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("extras", "0123_alter_joblogentry_created"),
+    ]
+
+    operations = [
+        migrations.AddIndex(
+            model_name="joblogentry",
+            index=models.Index(fields=["job_result", "created"], name="extras_joblog_jr_created_idx"),
+        ),
+    ]

nautobot/extras/models/customfields.py

@@ -1,4 +1,4 @@
-from collections import OrderedDict
+from collections import defaultdict, OrderedDict
 from datetime import date, datetime
 import json
 import logging
@@ -48,21 +48,42 @@ logger = logging.getLogger(__name__)
 class ComputedFieldManager(BaseManager.from_queryset(RestrictedQuerySet)):
     use_in_migrations = True
 
-    def get_for_model(self, model):
+    def get_for_model(self, model, get_queryset=True):
         """
         Return all ComputedFields assigned to the given model.
+
+        Returns a queryset by default, or a list if `get_queryset` param is False.
         """
         concrete_model = model._meta.concrete_model
         cache_key = f"{self.get_for_model.cache_key_prefix}.{concrete_model._meta.label_lower}"
+        list_cache_key = f"{cache_key}.list"
+        if not get_queryset:
+            listing = cache.get(list_cache_key)
+            if listing is not None:
+                return listing
         queryset = cache.get(cache_key)
         if queryset is None:
             content_type = ContentType.objects.get_for_model(concrete_model)
             queryset = self.get_queryset().filter(content_type=content_type)
             cache.set(cache_key, queryset)
+        if not get_queryset:
+            listing = list(queryset)
+            cache.set(list_cache_key, listing)
+            return listing
         return queryset
 
     get_for_model.cache_key_prefix = "nautobot.extras.computedfield.get_for_model"
 
+    def populate_list_caches(self):
+        """Populate all caches for `get_for_model(..., get_queryset=False)` lookups."""
+        queryset = self.all().select_related("content_type")
+        listings = defaultdict(list)
+        for cf in queryset:
+            listings[f"{cf.content_type.app_label}.{cf.content_type.model}"].append(cf)
+        for ct in ContentType.objects.all():
+            label = f"{ct.app_label}.{ct.model}"
+            cache.set(f"{self.get_for_model.cache_key_prefix}.{label}.list", listings[label])
+
 
 @extras_features("graphql")
 class ComputedField(
@@ -370,18 +391,24 @@ class CustomFieldModel(models.Model):
 class CustomFieldManager(BaseManager.from_queryset(RestrictedQuerySet)):
     use_in_migrations = True
 
-    def get_for_model(self, model, exclude_filter_disabled=False):
+    def get_for_model(self, model, exclude_filter_disabled=False, get_queryset=True):
         """
         Return (and cache) all CustomFields assigned to the given model.
 
         Args:
             model (Model): The django model to which custom fields are registered
             exclude_filter_disabled (bool): Exclude any custom fields which have filter logic disabled
+            get_queryset (bool): Whether to return a QuerySet or a list.
         """
         concrete_model = model._meta.concrete_model
         cache_key = (
             f"{self.get_for_model.cache_key_prefix}.{concrete_model._meta.label_lower}.{exclude_filter_disabled}"
         )
+        list_cache_key = f"{cache_key}.list"
+        if not get_queryset:
+            listing = cache.get(list_cache_key)
+            if listing is not None:
+                return listing
         queryset = cache.get(cache_key)
         if queryset is None:
             content_type = ContentType.objects.get_for_model(concrete_model)
@@ -389,6 +416,10 @@ class CustomFieldManager(BaseManager.from_queryset(RestrictedQuerySet)):
             if exclude_filter_disabled:
                 queryset = queryset.exclude(filter_logic=CustomFieldFilterLogicChoices.FILTER_DISABLED)
             cache.set(cache_key, queryset)
+        if not get_queryset:
+            listing = list(queryset)
+            cache.set(list_cache_key, listing)
+            return listing
         return queryset
 
     get_for_model.cache_key_prefix = "nautobot.extras.customfield.get_for_model"
@@ -405,6 +436,24 @@ class CustomFieldManager(BaseManager.from_queryset(RestrictedQuerySet)):
 
     keys_for_model.cache_key_prefix = "nautobot.extras.customfield.keys_for_model"
 
+    def populate_list_caches(self):
+        """Populate all caches for `get_for_model(..., get_queryset=False)` and `keys_for_model` lookups."""
+        queryset = self.all().prefetch_related("content_types")
+        cf_listings = defaultdict(lambda: defaultdict(list))
+        key_listings = defaultdict(list)
+        for cf in queryset:
+            for ct in cf.content_types.all():
+                label = f"{ct.app_label}.{ct.model}"
+                cf_listings[label][False].append(cf)
+                if cf.filter_logic != CustomFieldFilterLogicChoices.FILTER_DISABLED:
+                    cf_listings[label][True].append(cf)
+                key_listings[label].append(cf.key)
+        for ct in ContentType.objects.all():
+            label = f"{ct.app_label}.{ct.model}"
+            cache.set(f"{self.get_for_model.cache_key_prefix}.{label}.True.list", cf_listings[label][True])
+            cache.set(f"{self.get_for_model.cache_key_prefix}.{label}.False.list", cf_listings[label][False])
+            cache.set(f"{self.keys_for_model.cache_key_prefix}.{label}", key_listings[label])
+
 
 @extras_features("webhooks")
 class CustomField(

nautobot/extras/models/jobs.py

@@ -543,6 +543,12 @@ class JobLogEntry(BaseModel):
         ordering = ["created"]
         get_latest_by = "created"
         verbose_name_plural = "job log entries"
+        indexes = [
+            models.Index(
+                name="extras_joblog_jr_created_idx",
+                fields=["job_result", "created"],
+            )
+        ]
 
 
 #

nautobot/extras/models/relationships.py

@@ -1,3 +1,4 @@
+from collections import defaultdict
 import logging
 
 from django import forms
@@ -422,31 +423,38 @@ class RelationshipModel(models.Model):
 class RelationshipManager(BaseManager.from_queryset(RestrictedQuerySet)):
     use_in_migrations = True
 
-    def get_for_model(self, model, hidden=None):
+    def get_for_model(self, model, hidden=None, get_queryset=True):
         """
         Return all Relationships assigned to the given model.
 
         Args:
             model (Model): The django model to which relationships are registered
             hidden (bool): Filter based on the value of the hidden flag, or None to not apply this filter
+            get_queryset (bool): Whether to return querysets or object lists.
 
-        Returns a tuple of source and destination scoped relationship querysets.
+        Returns a tuple of source and destination scoped relationship record querysets/lists.
         """
         return (
-            self.get_for_model_source(model, hidden=hidden),
-            self.get_for_model_destination(model, hidden=hidden),
+            self.get_for_model_source(model, hidden=hidden, get_queryset=get_queryset),
+            self.get_for_model_destination(model, hidden=hidden, get_queryset=get_queryset),
         )
 
-    def get_for_model_source(self, model, hidden=None):
+    def get_for_model_source(self, model, hidden=None, get_queryset=True):
         """
         Return all Relationships assigned to the given model for the source side only.
 
         Args:
             model (Model): The django model to which relationships are registered
             hidden (bool): Filter based on the value of the hidden flag, or None to not apply this filter
+            get_queryset (bool): Whether to return a queryset or an object list.
         """
         concrete_model = model._meta.concrete_model
         cache_key = f"{self.get_for_model_source.cache_key_prefix}.{concrete_model._meta.label_lower}.{hidden}"
+        list_cache_key = f"{cache_key}.list"
+        if not get_queryset:
+            listing = cache.get(list_cache_key)
+            if listing is not None:
+                return listing
         queryset = cache.get(cache_key)
         if queryset is None:
             content_type = ContentType.objects.get_for_model(concrete_model)
@@ -456,20 +464,30 @@ class RelationshipManager(BaseManager.from_queryset(RestrictedQuerySet)):
             if hidden is not None:
                 queryset = queryset.filter(source_hidden=hidden)
             cache.set(cache_key, queryset)
+        if not get_queryset:
+            listing = list(queryset)
+            cache.set(list_cache_key, listing)
+            return listing
         return queryset
 
     get_for_model_source.cache_key_prefix = "nautobot.extras.relationship.get_for_model_source"
 
-    def get_for_model_destination(self, model, hidden=None):
+    def get_for_model_destination(self, model, hidden=None, get_queryset=True):
         """
         Return all Relationships assigned to the given model for the destination side only.
 
         Args:
             model (Model): The django model to which relationships are registered
             hidden (bool): Filter based on the value of the hidden flag, or None to not apply this filter
+            get_queryset (bool): Whether to return a queryset or an object list.
         """
         concrete_model = model._meta.concrete_model
         cache_key = f"{self.get_for_model_destination.cache_key_prefix}.{concrete_model._meta.label_lower}.{hidden}"
+        list_cache_key = f"{cache_key}.list"
+        if not get_queryset:
+            listing = cache.get(list_cache_key)
+            if listing is not None:
+                return listing
         queryset = cache.get(cache_key)
         if queryset is None:
             content_type = ContentType.objects.get_for_model(concrete_model)
@@ -481,6 +499,10 @@ class RelationshipManager(BaseManager.from_queryset(RestrictedQuerySet)):
             if hidden is not None:
                 queryset = queryset.filter(destination_hidden=hidden)
             cache.set(cache_key, queryset)
+        if not get_queryset:
+            listing = list(queryset)
+            cache.set(list_cache_key, listing)
+            return listing
         return queryset
 
     get_for_model_destination.cache_key_prefix = "nautobot.extras.relationship.get_for_model_destination"
@@ -495,6 +517,33 @@ class RelationshipManager(BaseManager.from_queryset(RestrictedQuerySet)):
             | Q(destination_type=content_type, required_on=RelationshipRequiredSideChoices.DESTINATION_SIDE_REQUIRED)
         )
 
+    def populate_list_caches(self):
+        """Populate all relevant caches for `get_for_model(..., get_queryset=False)` and related lookups."""
+        queryset = self.all().select_related("source_type", "destination_type")
+        listings = defaultdict(lambda: defaultdict(lambda: defaultdict(list)))
+        for rel in queryset:
+            listings["source"][f"{rel.source_type.app_label}.{rel.source_type.model}"]["None"].append(rel)
+            listings["source"][f"{rel.source_type.app_label}.{rel.source_type.model}"][str(rel.source_hidden)].append(
+                rel
+            )
+            listings["destination"][f"{rel.destination_type.app_label}.{rel.destination_type.model}"]["None"].append(
+                rel
+            )
+            listings["destination"][f"{rel.destination_type.app_label}.{rel.destination_type.model}"][
+                str(rel.destination_hidden)
+            ].append(rel)
+        for ct in ContentType.objects.all():
+            label = f"{ct.app_label}.{ct.model}"
+            for hidden in ["None", "True", "False"]:
+                cache.set(
+                    f"{self.get_for_model_source.cache_key_prefix}.{label}.{hidden}.list",
+                    listings["source"][label][hidden],
+                )
+                cache.set(
+                    f"{self.get_for_model_destination.cache_key_prefix}.{label}.{hidden}.list",
+                    listings["destination"][label][hidden],
+                )
+
 
 class Relationship(
     ChangeLoggedModel,

nautobot/extras/templates/extras/graphqlquery.html

@@ -1,97 +1,2 @@
-{% extends 'generic/object_retrieve.html' %}
-{% load helpers %}
-
-{% block content_left_page %}
-        <div class="panel panel-default">
-            <div class="panel-heading">
-                <strong>Query</strong>
-            </div>
-            <table class="table table-hover panel-body attr-table">
-                <tr>
-                    <td>Name</td>
-                    <td><span>{{ object.name }}</span></td>
-                </tr>
-                <tr>
-                    <td>Query</td>
-                    <td><pre id="query"><code class="language-graphql">{{ object.query }}</code></pre></td>
-                </tr>
-                <tr>
-                    <td>Query Variables</td>
-                    <td><pre>{{ object.variables|render_json }}</pre></td>
-                </tr>
-            </table>
-        </div>
-{% endblock content_left_page %}
-
-{% block content_right_page %}
-        <div class="panel panel-default">
-            <div class="panel-heading">
-                <strong>Response</strong>
-                <button class="btn btn-primary btn-xs pull-right" onclick="test_query()">Execute</button>
-            </div>
-            {% if object.variables %}
-                <table class="table table-hover panel-body attr-table">
-                    <tr>
-                        <td>Variables:</td>
-                        <td><textarea id="query_variables" class="form-control">{{ object.variables|render_json:False }}</textarea></td>
-                    </tr>
-                </table>
-            {% endif %}
-            <div class="panel-footer">
-                <pre id="query_output">
-
-                </pre>
-            </div>
-        </div>
-{% endblock content_right_page %}
-
-{% block javascript %}
-{{ block.super }}
-<script>
-    function fillQueryOutput(data) {
-        const queryOutput = document.querySelector('#query_output');
-
-        [...queryOutput.childNodes].forEach(childNode => childNode.remove());
-
-        const code = document.createElement('code');
-        code.classList.add('language-json');
-        code.textContent = JSON.stringify(data, undefined, 2);
-
-        queryOutput.appendChild(code);
-
-        hljs.highlightElement(code);
-    }
-
-    function test_query() {
-        const variables = document.querySelector('#query_variables')?.value;
-
-        $.ajax({
-            url: "{% url 'graphql' %}",
-            method: "POST",
-            headers: {"X-CSRFTOKEN": "{{ csrf_token }}"},
-            dataType: "json",
-            data: {
-                "query": `{{ object.query | escapejs }}`,
-                "variables": variables,
-            },
-            success: function(data) {
-                fillQueryOutput(data);
-            },
-            error: function(error) {
-                console.log(error);
-                fillQueryOutput(error.responseJSON);
-            }
-        });
-    };
-
-    textarea = document.querySelector("#query_variables");
-    textarea.addEventListener('input', autoResize, false);
-    textarea.style.height = 'auto';
-    textarea.style.height = textarea.scrollHeight + 'px';
-
-    function autoResize() {
-        this.style.height = 'auto';
-        this.style.height = this.scrollHeight + 'px';
-    }
-</script>
-{% endblock javascript %}
+{% extends 'extras/graphqlquery_retrieve.html' %}
+{% comment %}3.0 TODO: remove this template, which only exists for backward compatibility with 2.4 and earlier{% endcomment %}

nautobot/extras/templates/extras/graphqlquery_list.html

@@ -0,0 +1 @@
+{% extends "generic/object_list.html" %}

nautobot/extras/templates/extras/graphqlquery_retrieve.html

@@ -0,0 +1,97 @@
+{% extends 'generic/object_retrieve.html' %}
+{% load helpers %}
+
+{% block content_left_page %}
+        <div class="panel panel-default">
+            <div class="panel-heading">
+                <strong>Query</strong>
+            </div>
+            <table class="table table-hover panel-body attr-table">
+                <tr>
+                    <td>Name</td>
+                    <td><span>{{ object.name }}</span></td>
+                </tr>
+                <tr>
+                    <td>Query</td>
+                    <td><pre id="query"><code class="language-graphql">{{ object.query }}</code></pre></td>
+                </tr>
+                <tr>
+                    <td>Query Variables</td>
+                    <td><pre>{{ object.variables|render_json }}</pre></td>
+                </tr>
+            </table>
+        </div>
+{% endblock content_left_page %}
+
+{% block content_right_page %}
+        <div class="panel panel-default">
+            <div class="panel-heading">
+                <strong>Response</strong>
+                <button class="btn btn-primary btn-xs pull-right" onclick="test_query()">Execute</button>
+            </div>
+            {% if object.variables %}
+                <table class="table table-hover panel-body attr-table">
+                    <tr>
+                        <td>Variables:</td>
+                        <td><textarea id="query_variables" class="form-control">{{ object.variables|render_json:False }}</textarea></td>
+                    </tr>
+                </table>
+            {% endif %}
+            <div class="panel-footer">
+                <pre id="query_output">
+
+                </pre>
+            </div>
+        </div>
+{% endblock content_right_page %}
+
+{% block javascript %}
+{{ block.super }}
+<script>
+    function fillQueryOutput(data) {
+        const queryOutput = document.querySelector('#query_output');
+
+        [...queryOutput.childNodes].forEach(childNode => childNode.remove());
+
+        const code = document.createElement('code');
+        code.classList.add('language-json');
+        code.textContent = JSON.stringify(data, undefined, 2);
+
+        queryOutput.appendChild(code);
+
+        hljs.highlightElement(code);
+    }
+
+    function test_query() {
+        const variables = document.querySelector('#query_variables')?.value;
+
+        $.ajax({
+            url: "{% url 'graphql' %}",
+            method: "POST",
+            headers: {"X-CSRFTOKEN": "{{ csrf_token }}"},
+            dataType: "json",
+            data: {
+                "query": `{{ object.query | escapejs }}`,
+                "variables": variables,
+            },
+            success: function(data) {
+                fillQueryOutput(data);
+            },
+            error: function(error) {
+                console.log(error);
+                fillQueryOutput(error.responseJSON);
+            }
+        });
+    };
+
+    textarea = document.querySelector("#query_variables");
+    textarea.addEventListener('input', autoResize, false);
+    textarea.style.height = 'auto';
+    textarea.style.height = textarea.scrollHeight + 'px';
+
+    function autoResize() {
+        this.style.height = 'auto';
+        this.style.height = this.scrollHeight + 'px';
+    }
+</script>
+{% endblock javascript %}

nautobot/extras/templates/extras/secretsgroup.html

@@ -1,29 +1,2 @@
-{% extends "generic/object_retrieve.html" %}
-{% load helpers %}
-
-{% block content_left_page %}
-    <div class="panel panel-default">
-        <div class="panel-heading">
-            <strong>Secrets Group</strong>
-        </div>
-        <table class="table table-hover panel-body attr-table">
-            <tr>
-                <td>Description</td>
-                <td colspan="3">{{ object.description | placeholder }}</td>
-            </tr>
-            <tr>
-                <td rowspan="{{ secrets_group_associations | length | add:'1'}}">Secrets</td>
-                <th>Access Type</th>
-                <th>Secret Type</th>
-                <th>Secret</th>
-            </tr>
-            {% for secret_association in secrets_group_associations %}
-                <tr>
-                    <td>{{ secret_association.access_type }}</td>
-                    <td>{{ secret_association.secret_type | bettertitle }}</td>
-                    <td>{{ secret_association.secret|hyperlinked_object }}</td>
-                </tr>
-            {% endfor %}
-        </table>
-    </div>
-{% endblock content_left_page %}
+{% extends "extras/secretsgroup_retrieve.html" %}
+{% comment %}3.0 TODO: remove this template, which only exists for backward compatibility with 2.4 and earlier{% endcomment %}