From 0946a536f3d39fcbc137ab6fca1383ba2adcffe6 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <jstretch@netboxlabs.com>
Date: Mon, 25 Nov 2024 09:56:02 -0500
Subject: [PATCH] #4867: Misc cleanup

---
 netbox/dcim/forms/common.py          |  3 ++-
 netbox/dcim/forms/model_forms.py     |  6 ++++++
 netbox/netbox/navigation/menu.py     | 12 ++++++------
 netbox/templates/dcim/interface.html |  4 ++--
 4 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/netbox/dcim/forms/common.py b/netbox/dcim/forms/common.py
index 04c53b384..65d0d0f23 100644
--- a/netbox/dcim/forms/common.py
+++ b/netbox/dcim/forms/common.py
@@ -23,7 +23,8 @@ class InterfaceCommonForm(forms.Form):
     primary_mac_address = DynamicModelChoiceField(
         queryset=MACAddress.objects.all(),
         label=_('Primary MAC address'),
-        required=False
+        required=False,
+        quick_add=True
     )
 
     def __init__(self, *args, **kwargs):
diff --git a/netbox/dcim/forms/model_forms.py b/netbox/dcim/forms/model_forms.py
index 37cce9060..3e6d87ff0 100644
--- a/netbox/dcim/forms/model_forms.py
+++ b/netbox/dcim/forms/model_forms.py
@@ -1758,11 +1758,17 @@ class MACAddressForm(NetBoxModelForm):
         label=_('Interface'),
         queryset=Interface.objects.all(),
         required=False,
+        context={
+            'parent': 'device',
+        },
     )
     vminterface = DynamicModelChoiceField(
         label=_('VM Interface'),
         queryset=VMInterface.objects.all(),
         required=False,
+        context={
+            'parent': 'virtual_machine',
+        },
     )
 
     fieldsets = (
diff --git a/netbox/netbox/navigation/menu.py b/netbox/netbox/navigation/menu.py
index cf0649ac0..fbbd3d0b1 100644
--- a/netbox/netbox/navigation/menu.py
+++ b/netbox/netbox/navigation/menu.py
@@ -88,12 +88,6 @@ DEVICES_MENU = Menu(
                 get_model_item('dcim', 'manufacturer', _('Manufacturers')),
             ),
         ),
-        MenuGroup(
-            label=_('Addressing'),
-            items=(
-                get_model_item('dcim', 'macaddress', _('MAC Addresses')),
-            ),
-        ),
         MenuGroup(
             label=_('Device Components'),
             items=(
@@ -110,6 +104,12 @@ DEVICES_MENU = Menu(
                 get_model_item('dcim', 'inventoryitemrole', _('Inventory Item Roles')),
             ),
         ),
+        MenuGroup(
+            label=_('Addressing'),
+            items=(
+                get_model_item('dcim', 'macaddress', _('MAC Addresses')),
+            ),
+        ),
     ),
 )
 
diff --git a/netbox/templates/dcim/interface.html b/netbox/templates/dcim/interface.html
index b0d307bee..1658dd37e 100644
--- a/netbox/templates/dcim/interface.html
+++ b/netbox/templates/dcim/interface.html
@@ -124,8 +124,8 @@
           <tr>
             <th scope="row">{% trans "MAC Address" %}</th>
             <td>
-              {% if object.mac_address %}
-                <span class="font-monospace">{{ object.mac_address }}</span>
+              {% if object.primary_mac_address %}
+                <span class="font-monospace">{{ object.primary_mac_address|linkify }}</span>
                 <span class="badge text-bg-primary">{% trans "Primary" %}</span>
               {% else %}
                 {{ ''|placeholder }}