Merge branch 'develop' into feature

2026-01-14 15:52:18 -06:00 · 2022-04-25 12:20:46 -04:00
parent 0b7f89decf 3384b5d468
commit ab7c341e32
42 changed files with 221 additions and 45 deletions
--- a/netbox/templates/extras/customfield.html
+++ b/netbox/templates/extras/customfield.html
@@ -25,7 +25,10 @@
          </tr>
          <tr>
            <th scope="row">Type</th>
-            <td>{{ object.get_type_display }}</td>
+            <td>
+              {{ object.get_type_display }}
+              {% if object.object_type %}({{ object.object_type.model|bettertitle }}){% endif %}
+            </td>
          </tr>
          <tr>
            <th scope="row">Description</th>