Also include vminterface.html

netbox/dcim/forms/model_forms.py

@@ -20,9 +20,7 @@ from utilities.forms.fields import (
     DynamicModelChoiceField, DynamicModelMultipleChoiceField, JSONField, NumericArrayField, SlugField,
 )
 from utilities.forms.rendering import FieldSet, InlineFields, TabbedGroups
-from utilities.forms.widgets import (
-    APISelect, ClearableFileInput, ClearableSelect, HTMXSelect, NumberWithOptions, SelectWithPK,
-)
+from utilities.forms.widgets import APISelect, ClearableFileInput, HTMXSelect, NumberWithOptions, SelectWithPK
 from utilities.jsonschema import JSONSchemaProperty
 from virtualization.models import Cluster, VMInterface
 from wireless.models import WirelessLAN, WirelessLANGroup
@@ -594,14 +592,6 @@ class DeviceForm(TenancyForm, PrimaryModelForm):
             },
         )
     )
-    face = forms.ChoiceField(
-        label=_('Face'),
-        choices=add_blank_choice(DeviceFaceChoices),
-        required=False,
-        widget=ClearableSelect(
-            requires_fields=['rack']
-        )
-    )
     device_type = DynamicModelChoiceField(
         label=_('Device type'),
         queryset=DeviceType.objects.all(),

netbox/dcim/models/device_components.py

@@ -732,6 +732,25 @@ 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,6 +616,7 @@ class BaseInterfaceTable(NetBoxTable):
     )
     primary_mac_address = tables.Column(
         verbose_name=_('MAC Address'),
+        accessor=Accessor('mac_address_display'),
         linkify=True
     )
 

netbox/extras/events.py

@@ -1,5 +1,5 @@
 import logging
-from collections import UserDict, defaultdict
+from collections import defaultdict
 
 from django.conf import settings
 from django.utils import timezone
@@ -12,6 +12,7 @@ from core.models import ObjectType
 from netbox.config import get_config
 from netbox.constants import RQ_QUEUE_DEFAULT
 from netbox.models.features import has_feature
+from users.models import User
 from utilities.api import get_serializer_for_model
 from utilities.request import copy_safe_request
 from utilities.rqworker import get_rq_retry
@@ -22,19 +23,6 @@ from .models import EventRule
 logger = logging.getLogger('netbox.events_processor')
 
 
-class EventContext(UserDict):
-    """
-    A custom dictionary that automatically serializes its associated object on demand.
-    """
-
-    def __getitem__(self, item):
-        if item == 'data' and 'data' not in self:
-            data = serialize_for_event(self['object'])
-            self.__setitem__('data', data)
-            return data
-        return super().__getitem__(item)
-
-
 def serialize_for_event(instance):
     """
     Return a serialized representation of the given instance suitable for use in a queued event.
@@ -78,42 +66,37 @@ def enqueue_event(queue, instance, request, event_type):
     assert instance.pk is not None
     key = f'{app_label}.{model_name}:{instance.pk}'
     if key in queue:
+        queue[key]['data'] = serialize_for_event(instance)
         queue[key]['snapshots']['postchange'] = get_snapshots(instance, event_type)['postchange']
         # If the object is being deleted, update any prior "update" event to "delete"
         if event_type == OBJECT_DELETED:
             queue[key]['event_type'] = event_type
     else:
-        queue[key] = EventContext(
-            object_type=ObjectType.objects.get_for_model(instance),
-            object_id=instance.pk,
-            object=instance,
-            event_type=event_type,
-            snapshots=get_snapshots(instance, event_type),
-            request=request,
-            user=request.user,
+        queue[key] = {
+            'object_type': ObjectType.objects.get_for_model(instance),
+            'object_id': instance.pk,
+            'event_type': event_type,
+            'data': serialize_for_event(instance),
+            'snapshots': get_snapshots(instance, event_type),
+            'request': request,
             # Legacy request attributes for backward compatibility
-            username=request.user.username,
-            request_id=request.id,
-        )
-    # Force serialization of objects prior to them actually being deleted
-    if event_type == OBJECT_DELETED:
-        queue[key]['data'] = serialize_for_event(instance)
+            'username': request.user.username,
+            'request_id': request.id,
+        }
 
 
-def process_event_rules(event_rules, object_type, event):
-    """
-    Process a list of EventRules against an event.
-    """
+def process_event_rules(event_rules, object_type, event_type, data, username=None, snapshots=None, request=None):
+    user = User.objects.get(username=username) if username else None
 
     for event_rule in event_rules:
 
         # Evaluate event rule conditions (if any)
-        if not event_rule.eval_conditions(event['data']):
+        if not event_rule.eval_conditions(data):
             continue
 
         # Compile event data
         event_data = event_rule.action_data or {}
-        event_data.update(event['data'])
+        event_data.update(data)
 
         # Webhooks
         if event_rule.action_type == EventRuleActionChoices.WEBHOOK:
@@ -126,22 +109,25 @@ def process_event_rules(event_rules, object_type, event):
             params = {
                 "event_rule": event_rule,
                 "object_type": object_type,
-                "event_type": event['event_type'],
+                "event_type": event_type,
                 "data": event_data,
-                "snapshots": event['snapshots'],
+                "snapshots": snapshots,
                 "timestamp": timezone.now().isoformat(),
-                "username": event['username'],
+                "username": username,
                 "retry": get_rq_retry()
             }
-            if 'snapshots' in event:
-                params['snapshots'] = event['snapshots']
-            if 'request' in event:
+            if snapshots:
+                params["snapshots"] = snapshots
+            if request:
                 # Exclude FILES - webhooks don't need uploaded files,
                 # which can cause pickle errors with Pillow.
-                params['request'] = copy_safe_request(event['request'], include_files=False)
+                params["request"] = copy_safe_request(request, include_files=False)
 
             # Enqueue the task
-            rq_queue.enqueue('extras.webhooks.send_webhook', **params)
+            rq_queue.enqueue(
+                "extras.webhooks.send_webhook",
+                **params
+            )
 
         # Scripts
         elif event_rule.action_type == EventRuleActionChoices.SCRIPT:
@@ -153,16 +139,16 @@ def process_event_rules(event_rules, object_type, event):
             params = {
                 "instance": event_rule.action_object,
                 "name": script.name,
-                "user": event['user'],
+                "user": user,
                 "data": event_data
             }
-            if 'snapshots' in event:
-                params['snapshots'] = event['snapshots']
-            if 'request' in event:
-                params['request'] = copy_safe_request(event['request'])
-
-            # Enqueue the job
-            ScriptJob.enqueue(**params)
+            if snapshots:
+                params["snapshots"] = snapshots
+            if request:
+                params["request"] = copy_safe_request(request)
+            ScriptJob.enqueue(
+                **params
+            )
 
         # Notification groups
         elif event_rule.action_type == EventRuleActionChoices.NOTIFICATION:
@@ -171,7 +157,7 @@ def process_event_rules(event_rules, object_type, event):
                 object_type=object_type,
                 object_id=event_data['id'],
                 object_repr=event_data.get('display'),
-                event_type=event['event_type']
+                event_type=event_type
             )
 
         else:
@@ -183,8 +169,6 @@ def process_event_rules(event_rules, object_type, event):
 def process_event_queue(events):
     """
     Flush a list of object representation to RQ for EventRule processing.
-
-    This is the default processor listed in EVENTS_PIPELINE.
     """
     events_cache = defaultdict(dict)
 
@@ -204,7 +188,11 @@ def process_event_queue(events):
         process_event_rules(
             event_rules=event_rules,
             object_type=object_type,
-            event=event,
+            event_type=event['event_type'],
+            data=event['data'],
+            username=event['username'],
+            snapshots=event['snapshots'],
+            request=event['request'],
         )
 
 

netbox/extras/signals.py

@@ -4,7 +4,7 @@ from django.dispatch import receiver
 
 from core.events import *
 from core.signals import job_end, job_start
-from extras.events import EventContext, process_event_rules
+from extras.events import process_event_rules
 from extras.models import EventRule, Notification, Subscription
 from netbox.config import get_config
 from netbox.models.features import has_feature
@@ -102,12 +102,14 @@ def process_job_start_event_rules(sender, **kwargs):
         enabled=True,
         object_types=sender.object_type
     )
-    event = EventContext(
+    username = sender.user.username if sender.user else None
+    process_event_rules(
+        event_rules=event_rules,
+        object_type=sender.object_type,
         event_type=JOB_STARTED,
         data=sender.data,
-        user=sender.user,
+        username=username
     )
-    process_event_rules(event_rules, sender.object_type, event)
 
 
 @receiver(job_end)
@@ -120,12 +122,14 @@ def process_job_end_event_rules(sender, **kwargs):
         enabled=True,
         object_types=sender.object_type
     )
-    event = EventContext(
+    username = sender.user.username if sender.user else None
+    process_event_rules(
+        event_rules=event_rules,
+        object_type=sender.object_type,
         event_type=JOB_COMPLETED,
         data=sender.data,
-        user=sender.user,
+        username=username
     )
-    process_event_rules(event_rules, sender.object_type, event)
 
 
 #

netbox/project-static/src/forms/clearField.ts

@@ -1,40 +0,0 @@
-import TomSelect from 'tom-select';
-import { getElements } from '../util';
-
-/**
- * Initialize clear-field dependencies.
- * When a required field is cleared, dependent fields with data-requires-fields attribute will also be cleared.
- */
-export function initClearField(): void {
-  // Find all fields with data-requires-fields attribute
-  for (const field of getElements<HTMLSelectElement>('[data-requires-fields]')) {
-    const requiredFieldsAttr = field.getAttribute('data-requires-fields');
-    if (!requiredFieldsAttr) continue;
-
-    // Parse the comma-separated list of required field names
-    const requiredFields = requiredFieldsAttr.split(',').map(name => name.trim());
-
-    // Set up listeners for each required field
-    for (const requiredFieldName of requiredFields) {
-      const requiredField = document.querySelector<HTMLSelectElement>(
-        `[name="${requiredFieldName}"]`,
-      );
-      if (!requiredField) continue;
-
-      // Listen for changes on the required field
-      requiredField.addEventListener('change', () => {
-        // If required field is cleared, also clear this dependent field
-        if (!requiredField.value || requiredField.value === '') {
-          // Check if this field uses TomSelect
-          const tomselect = (field as HTMLSelectElement & { tomselect?: TomSelect }).tomselect;
-          if (tomselect) {
-            tomselect.clear();
-          } else {
-            // Regular select field
-            field.value = '';
-          }
-        }
-      });
-    }
-  }
-}

netbox/project-static/src/forms/index.ts

@@ -1,10 +1,9 @@
-import { initClearField } from './clearField';
 import { initFormElements } from './elements';
 import { initFilterModifiers } from './filterModifiers';
 import { initSpeedSelector } from './speedSelector';
 
 export function initForms(): void {
-  for (const func of [initFormElements, initSpeedSelector, initFilterModifiers, initClearField]) {
+  for (const func of [initFormElements, initSpeedSelector, initFilterModifiers]) {
     func();
   }
 }

netbox/templates/dcim/interface.html

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

netbox/templates/virtualization/vminterface.html

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

netbox/utilities/forms/widgets/select.py

@@ -5,7 +5,6 @@ from ..utils import add_blank_choice
 
 __all__ = (
     'BulkEditNullBooleanSelect',
-    'ClearableSelect',
     'ColorSelect',
     'HTMXSelect',
     'SelectWithPK',
@@ -29,21 +28,6 @@ class BulkEditNullBooleanSelect(forms.NullBooleanSelect):
         )
 
 
-class ClearableSelect(forms.Select):
-    """
-    A Select widget that will be automatically cleared when one or more required fields are cleared.
-
-    Args:
-        requires_fields: A list of field names that this field depends on. When any of these fields
-                        are cleared, this field will also be cleared automatically via JavaScript.
-    """
-
-    def __init__(self, *args, requires_fields=None, **kwargs):
-        super().__init__(*args, **kwargs)
-        if requires_fields:
-            self.attrs['data-requires-fields'] = ','.join(requires_fields)
-
-
 class ColorSelect(forms.Select):
     """
     Extends the built-in Select widget to colorize each <option>.