nautobot 2.4.15__py3-none-any.whl → 2.4.16__py3-none-any.whl

nautobot/extras/tables.py

@@ -56,6 +56,7 @@ from .models import (
     ScheduledJob,
     Secret,
     SecretsGroup,
+    SecretsGroupAssociation,
     StaticGroupAssociation,
     Status,
     Tag,
@@ -1330,6 +1331,17 @@ class SecretsGroupTable(BaseTable):
         )
 
 
+class SecretsGroupAssociationTable(BaseTable):
+    secret = tables.Column(linkify=True)
+
+    class Meta:
+        model = SecretsGroupAssociation
+        fields = ("access_type", "secret_type", "secret")
+        default_columns = ("access_type", "secret_type", "secret")
+        # Avoid extra UI clutter
+        attrs = {"class": "table table-condensed"}
+
+
 #
 # Custom statuses
 #

nautobot/extras/templates/extras/marketplace.html

@@ -70,7 +70,7 @@
         <a class="btn btn-primary" href="{% url 'apps:apps_list' %}">See Installed Apps</a>
     </div>
 
-    <h1>{% block page_heading %}{% render_title %}{% block page_heading %}</h1>
+    <h1>{% block page_heading %}{% render_title %}{% endblock page_heading %}</h1>
 
     <div class="row">
         <div class="col-md-12">

nautobot/extras/templates/extras/secretsgroup_retrieve.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 'generic/object_retrieve.html' %}
+{% comment %}3.0 TODO: remove this template, which only exists for backward compatibility with 2.4 and earlier{% endcomment %}

nautobot/extras/tests/test_plugins.py

@@ -393,6 +393,18 @@ class PluginDetailViewTest(TestCase):
         self.assertIn("For testing purposes only", response_body, msg=response_body)
 
 
+class MarketplaceViewTest(TestCase):
+    def test_view_anonymous(self):
+        self.client.logout()
+        response = self.client.get(reverse("apps:apps_marketplace"))
+        # Redirects to the login page
+        self.assertHttpStatus(response, 302)
+
+    def test_view_authenticated(self):
+        response = self.client.get(reverse("apps:apps_marketplace"))
+        self.assertHttpStatus(response, 200)
+
+
 class AppAPITest(APIViewTestCases.APIViewTestCase):
     model = ExampleModel
     bulk_update_data = {

nautobot/extras/views.py

@@ -125,7 +125,6 @@ from .models import (
     ScheduledJob,
     Secret,
     SecretsGroup,
-    SecretsGroupAssociation,
     StaticGroupAssociation,
     Status,
     Tag,
@@ -2643,13 +2642,29 @@ class SecretsGroupUIViewSet(NautobotUIViewSet):
     form_class = forms.SecretsGroupForm
     serializer_class = serializers.SecretsGroupSerializer
     table_class = tables.SecretsGroupTable
-    template_name = "extras/secretsgroup_update.html"
     queryset = SecretsGroup.objects.all()
 
+    object_detail_content = ObjectDetailContent(
+        panels=(
+            object_detail.ObjectFieldsPanel(
+                label="Secrets Group Details",
+                fields=["description"],
+                section=SectionChoices.LEFT_HALF,
+                weight=100,
+            ),
+            object_detail.ObjectsTablePanel(
+                table_class=tables.SecretsGroupAssociationTable,
+                table_filter="secrets_group",
+                related_field_name="secrets_group",
+                table_title="Secrets",
+                section=SectionChoices.LEFT_HALF,
+                weight=200,
+            ),
+        )
+    )
+
     def get_extra_context(self, request, instance=None):
         context = super().get_extra_context(request, instance)
-        if self.action == "retrieve" and instance:
-            context["secrets_group_associations"] = SecretsGroupAssociation.objects.filter(secrets_group=instance)
         if self.action in ("create", "update"):
             if request.method == "POST":
                 context["secrets"] = forms.SecretsGroupAssociationFormSet(data=request.POST, instance=instance)

nautobot/project-static/docs/release-notes/version-2.4.html

@@ -9691,6 +9691,39 @@
       </ul>
     </nav>
   
+</li>
+      
+        <li class="md-nav__item">
+  <a href="#v2416-2025-08-19" class="md-nav__link">
+    <span class="md-ellipsis">
+      v2.4.16 (2025-08-19)
+    </span>
+  </a>
+  
+    <nav class="md-nav" aria-label="v2.4.16 (2025-08-19)">
+      <ul class="md-nav__list">
+        
+          <li class="md-nav__item">
+  <a href="#fixed-in-v2416" class="md-nav__link">
+    <span class="md-ellipsis">
+      Fixed in v2.4.16
+    </span>
+  </a>
+  
+</li>
+        
+          <li class="md-nav__item">
+  <a href="#housekeeping-in-v2416" class="md-nav__link">
+    <span class="md-ellipsis">
+      Housekeeping in v2.4.16
+    </span>
+  </a>
+  
+</li>
+        
+      </ul>
+    </nav>
+  
 </li>
       
         <li class="md-nav__item">
@@ -11635,6 +11668,39 @@
       </ul>
     </nav>
   
+</li>
+      
+        <li class="md-nav__item">
+  <a href="#v2416-2025-08-19" class="md-nav__link">
+    <span class="md-ellipsis">
+      v2.4.16 (2025-08-19)
+    </span>
+  </a>
+  
+    <nav class="md-nav" aria-label="v2.4.16 (2025-08-19)">
+      <ul class="md-nav__list">
+        
+          <li class="md-nav__item">
+  <a href="#fixed-in-v2416" class="md-nav__link">
+    <span class="md-ellipsis">
+      Fixed in v2.4.16
+    </span>
+  </a>
+  
+</li>
+        
+          <li class="md-nav__item">
+  <a href="#housekeeping-in-v2416" class="md-nav__link">
+    <span class="md-ellipsis">
+      Housekeeping in v2.4.16
+    </span>
+  </a>
+  
+</li>
+        
+      </ul>
+    </nav>
+  
 </li>
       
         <li class="md-nav__item">
@@ -12829,6 +12895,15 @@
 
 <!-- towncrier release notes start -->
 
+<h2 id="v2416-2025-08-19">v2.4.16 (2025-08-19)<a class="headerlink" href="#v2416-2025-08-19" title="Permanent link">&para;</a></h2>
+<h3 id="fixed-in-v2416">Fixed in v2.4.16<a class="headerlink" href="#fixed-in-v2416" title="Permanent link">&para;</a></h3>
+<ul>
+<li><a href="https://github.com/nautobot/nautobot/issues/7699">#7699</a> - Fixed breakage of the "Apps Marketplace" view in Nautobot v2.4.15.</li>
+</ul>
+<h3 id="housekeeping-in-v2416">Housekeeping in v2.4.16<a class="headerlink" href="#housekeeping-in-v2416" title="Permanent link">&para;</a></h3>
+<ul>
+<li><a href="https://github.com/nautobot/nautobot/issues/7643">#7643</a> - Refactored SecretsGroup model related UI views to use <code>UI component framework</code>.</li>
+</ul>
 <h2 id="v2415-2025-08-18">v2.4.15 (2025-08-18)<a class="headerlink" href="#v2415-2025-08-18" title="Permanent link">&para;</a></h2>
 <h3 id="added-in-v2415">Added in v2.4.15<a class="headerlink" href="#added-in-v2415" title="Permanent link">&para;</a></h3>
 <ul>