fix(dcim): Avoid clearing scope on clone

ScopedForm._set_scoped_values() cleared initial['scope'] whenever the
scope_type differed from the instance value. During cloning (unsaved
instance), this runs on the initial GET and wipes the pre-filled scope,
forcing the user to re-select it.

Only clear the scope when editing an existing object (instance.pk set)
and the scope type has actually changed.

Fixes #21202

netbox/dcim/forms/mixins.py

@@ -75,7 +75,7 @@ class ScopedForm(forms.Form):
             except ObjectDoesNotExist:
                 pass
 
-            if self.instance and scope_type_id != self.instance.scope_type_id:
+            if self.instance and self.instance.pk and scope_type_id != self.instance.scope_type_id:
                 self.initial['scope'] = None
 
         else:

netbox/dcim/models/device_components.py

@@ -732,25 +732,6 @@ class BaseInterface(models.Model):
         if self.primary_mac_address:
             return self.primary_mac_address.mac_address
 
-    @property
-    def mac_address_display(self):
-        """
-        Rich representation of MAC addresses for use in table columns (e.g. InterfaceTable).
-        Handles various configurations of MAC addresses for an interface:
-        11:22:33:44:55:66      <-- Single MAC address on interface, assigned as primary
-        11:22:33:44:55:66 (2)  <-- Multiple MAC addresses on interface, one assigned as primary
-        2 available            <-- 1 or more MAC addresses on interface, none assigned as primary
-        -                      <-- No MAC addresses on interface
-        """
-        available_mac_count = self.mac_addresses.count()
-        if self.primary_mac_address:
-            if available_mac_count > 1:
-                return f"{self.primary_mac_address} ({available_mac_count})"
-            return self.primary_mac_address
-        if available_mac_count:
-            return f"{available_mac_count} available"
-        return None
-
 
 class Interface(
     InterfaceValidationMixin,

netbox/dcim/tables/devices.py

@@ -616,7 +616,6 @@ class BaseInterfaceTable(NetBoxTable):
     )
     primary_mac_address = tables.Column(
         verbose_name=_('MAC Address'),
-        accessor=Accessor('mac_address_display'),
         linkify=True
     )
 

netbox/templates/dcim/interface.html

@@ -143,11 +143,9 @@
           <tr>
             <th scope="row">{% trans "MAC Address" %}</th>
             <td>
-              {% if object.mac_address_display %}
+              {% if object.primary_mac_address %}
-                <span class="font-monospace">{{ object.mac_address_display|linkify }}</span>
+                <span class="font-monospace">{{ object.primary_mac_address|linkify }}</span>
-                {% if object.primary_mac_address %}
+                <span class="badge text-bg-primary">{% trans "Primary" %}</span>
-                  <span class="badge text-bg-primary">{% trans "Primary" %}</span>
-                {% endif %}
               {% else %}
                 {{ ''|placeholder }}
               {% endif %}

netbox/templates/virtualization/vminterface.html

@@ -78,11 +78,9 @@
         <tr>
           <th scope="row">{% trans "MAC Address" %}</th>
           <td>
-            {% if object.mac_address_display %}
+            {% if object.mac_address %}
-              <span class="font-monospace">{{ object.mac_address_display|linkify }}</span>
+              <span class="font-monospace">{{ object.mac_address }}</span>
-              {% if object.primary_mac_address %}
+              <span class="badge text-bg-primary">{% trans "Primary" %}</span>
-                <span class="badge text-bg-primary">{% trans "Primary" %}</span>
-              {% endif %}
             {% else %}
               {{ ''|placeholder }}
             {% endif %}