From b9576ed38cbc7801b03c110e4635345befc5adbc Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <jstretch@netboxlabs.com>
Date: Thu, 23 Oct 2025 19:57:29 -0400
Subject: [PATCH] Misc cleanup

---
 netbox/templates/dcim/device_edit.html         |  7 +++++++
 netbox/templates/dcim/htmx/cable_edit.html     |  7 +++++++
 netbox/templates/dcim/virtualchassis_edit.html | 11 +++++++++--
 netbox/templates/ipam/vlan_edit.html           |  7 +++++++
 netbox/templates/users/ownergroup.html         |  2 +-
 5 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/netbox/templates/dcim/device_edit.html b/netbox/templates/dcim/device_edit.html
index 7b010cb63..454faf8fb 100644
--- a/netbox/templates/dcim/device_edit.html
+++ b/netbox/templates/dcim/device_edit.html
@@ -99,6 +99,13 @@
       {% render_field form.vc_priority %}
     </div>
 
+    <div class="field-group mb-5">
+      <div class="row">
+        <h2 class="col-9 offset-3">{% trans "Owner" %}</h2>
+      </div>
+      {% render_field form.owner %}
+    </div>
+
     {% if form.custom_fields %}
       <div class="field-group my-5">
         <div class="row">
diff --git a/netbox/templates/dcim/htmx/cable_edit.html b/netbox/templates/dcim/htmx/cable_edit.html
index b0b2ce750..6de42fc49 100644
--- a/netbox/templates/dcim/htmx/cable_edit.html
+++ b/netbox/templates/dcim/htmx/cable_edit.html
@@ -77,6 +77,13 @@
   {% render_field form.tenant %}
 </div>
 
+<div class="field-group mb-5">
+  <div class="row">
+    <h2 class="col-9 offset-3">{% trans "Owner" %}</h2>
+  </div>
+  {% render_field form.owner %}
+</div>
+
 {% if form.custom_fields %}
   <div class="field-group mb-5">
     <div class="row">
diff --git a/netbox/templates/dcim/virtualchassis_edit.html b/netbox/templates/dcim/virtualchassis_edit.html
index 768fb7666..8744947fa 100644
--- a/netbox/templates/dcim/virtualchassis_edit.html
+++ b/netbox/templates/dcim/virtualchassis_edit.html
@@ -34,8 +34,11 @@
         {% render_field vc_form.tags %}
       </div>
 
-      <div class="field-group my-5">
-        {% render_field vc_form.comments %}
+      <div class="field-group mb-5">
+        <div class="row">
+          <h2 class="col-9 offset-3">{% trans "Owner" %}</h2>
+        </div>
+        {% render_field vc_form.owner %}
       </div>
 
       {% if vc_form.custom_fields %}
@@ -47,6 +50,10 @@
         </div>
       {% endif %}
 
+      <div class="field-group my-5">
+        {% render_field vc_form.comments %}
+      </div>
+
       <div class="field-group mb-5">
         <h2 class="text-center">{% trans "Members" %}</h2>
         <table class="table">
diff --git a/netbox/templates/ipam/vlan_edit.html b/netbox/templates/ipam/vlan_edit.html
index b6c21f972..623468af2 100644
--- a/netbox/templates/ipam/vlan_edit.html
+++ b/netbox/templates/ipam/vlan_edit.html
@@ -65,6 +65,13 @@
     {% endwith %}
   </div>
 
+  <div class="field-group mb-5">
+    <div class="row">
+      <h2 class="col-9 offset-3">{% trans "Owner" %}</h2>
+    </div>
+    {% render_field form.owner %}
+  </div>
+
   {% if form.custom_fields %}
     <div class="field-group my-5">
       <div class="row">
diff --git a/netbox/templates/users/ownergroup.html b/netbox/templates/users/ownergroup.html
index 1a74c3d48..c45da792a 100644
--- a/netbox/templates/users/ownergroup.html
+++ b/netbox/templates/users/ownergroup.html
@@ -35,7 +35,7 @@
         <h2 class="card-header">{% trans "Members" %}</h2>
         <div class="list-group list-group-flush">
           {% for owner in object.members.all %}
-            <a href="{% url 'users:owner' pk=user.pk %}" class="list-group-item list-group-item-action">{{ owner }}</a>
+            <a href="{% url 'users:owner' pk=owner.pk %}" class="list-group-item list-group-item-action">{{ owner }}</a>
           {% empty %}
             <div class="list-group-item text-muted">{% trans "None" %}</div>
           {% endfor %}