From 6c58b4e8c0349aea476a0ff76973d28d325828e8 Mon Sep 17 00:00:00 2001
From: Brian Tiemann <btman@mac.com>
Date: Thu, 14 May 2026 08:48:06 -0400
Subject: [PATCH] Code review improvements to BulkRenameView label selector

- Use _meta.fields (concrete fields only) instead of _meta.get_fields()
  to check for label field presence; avoids iterating reverse relations
- Simplify template column headers via blocktrans + field_name|title
  instead of duplicated if/else blocks

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 netbox/netbox/views/generic/bulk_views.py | 2 +-
 netbox/templates/generic/bulk_rename.html | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/netbox/netbox/views/generic/bulk_views.py b/netbox/netbox/views/generic/bulk_views.py
index 3e8f29948..da03d518a 100644
--- a/netbox/netbox/views/generic/bulk_views.py
+++ b/netbox/netbox/views/generic/bulk_views.py
@@ -894,7 +894,7 @@ class BulkRenameView(GetReturnURLMixin, BaseMultiObjectView):
         """
         if self.field_name != 'name':
             return []
-        model_field_names = {f.name for f in self.queryset.model._meta.get_fields()}
+        model_field_names = {f.name for f in self.queryset.model._meta.fields}
         if 'label' not in model_field_names:
             return []
         return [('name', _('Name')), ('label', _('Label'))]
diff --git a/netbox/templates/generic/bulk_rename.html b/netbox/templates/generic/bulk_rename.html
index a52d0e1ef..037d2ce1f 100644
--- a/netbox/templates/generic/bulk_rename.html
+++ b/netbox/templates/generic/bulk_rename.html
@@ -35,10 +35,12 @@ Context:
     <div class="col col-md-7">
         <table class="table">
             <thead>
+                {% with field_label=field_name|title %}
                 <tr>
-                    <th>{% if field_name == 'label' %}{% trans "Current Label" %}{% else %}{% trans "Current Name" %}{% endif %}</th>
-                    <th>{% if field_name == 'label' %}{% trans "New Label" %}{% else %}{% trans "New Name" %}{% endif %}</th>
+                    <th>{% blocktrans %}Current {{ field_label }}{% endblocktrans %}</th>
+                    <th>{% blocktrans %}New {{ field_label }}{% endblocktrans %}</th>
                 </tr>
+                {% endwith %}
             </thead>
             <tbody>
                 {% for obj in selected_objects %}