Просмотр исходного кода

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>
Brian Tiemann 1 неделя назад
Родитель
Сommit
6c58b4e8c0
2 измененных файлов с 5 добавлено и 3 удалено
  1. 1 1
      netbox/netbox/views/generic/bulk_views.py
  2. 4 2
      netbox/templates/generic/bulk_rename.html

+ 1 - 1
netbox/netbox/views/generic/bulk_views.py

@@ -894,7 +894,7 @@ class BulkRenameView(GetReturnURLMixin, BaseMultiObjectView):
         """
         """
         if self.field_name != 'name':
         if self.field_name != 'name':
             return []
             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:
         if 'label' not in model_field_names:
             return []
             return []
         return [('name', _('Name')), ('label', _('Label'))]
         return [('name', _('Name')), ('label', _('Label'))]

+ 4 - 2
netbox/templates/generic/bulk_rename.html

@@ -35,10 +35,12 @@ Context:
     <div class="col col-md-7">
     <div class="col col-md-7">
         <table class="table">
         <table class="table">
             <thead>
             <thead>
+                {% with field_label=field_name|title %}
                 <tr>
                 <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>
                 </tr>
+                {% endwith %}
             </thead>
             </thead>
             <tbody>
             <tbody>
                 {% for obj in selected_objects %}
                 {% for obj in selected_objects %}