diff --git a/docs/release-notes/version-4.1.md b/docs/release-notes/version-4.1.md index 38660447f..9ff850832 100644 --- a/docs/release-notes/version-4.1.md +++ b/docs/release-notes/version-4.1.md @@ -7,6 +7,7 @@ * Several filters deprecated in v4.0 have been removed (see [#15410](https://github.com/netbox-community/netbox/issues/15410)). * The unit size for virtual disk size has been changed from 1 gigabyte to 1 megabyte. Existing values have been updated accordingly. * The `min_vid` and `max_vid` fields on the VLAN group model have been replaced with `vid_ranges`, an array of starting and ending integer pairs. +* The five individual event type fields on the EventRule model have been replaced by a single `event_types` array field, indicating each assigned event type by name. * The `validate()` method on CustomValidator subclasses now **must** accept the request argument (deprecated in v4.0 by #14279). ### New Features @@ -72,6 +73,9 @@ NetBox now includes a user notification system. Users can subscribe to individua * Added the optional `airflow` choice field * extras.CustomField * Added the `related_object_filter` JSON field for object and multi-object custom fields +* extras.EventRule + * Removed the `type_create`, `type_update`, `type_delete`, `type_job_start`, and `type_job_end` boolean fields + * Added the `event_types` array field * ipam.VLANGroup * Removed the `min_vid` and `max_vid` fields * Added the `vid_ranges` field, and array of starting & ending VLAN IDs diff --git a/netbox/extras/views.py b/netbox/extras/views.py index 2a5b6ef05..8eb9f412d 100644 --- a/netbox/extras/views.py +++ b/netbox/extras/views.py @@ -551,14 +551,6 @@ class EventRuleListView(generic.ObjectListView): class EventRuleView(generic.ObjectView): queryset = EventRule.objects.all() - def get_extra_context(self, request, instance): - return { - 'event_types': [ - event for name, event in registry['event_types'].items() - if name in instance.event_types - ] - } - @register_model_view(EventRule, 'edit') class EventRuleEditView(generic.ObjectEditView): diff --git a/netbox/templates/extras/eventrule.html b/netbox/templates/extras/eventrule.html index 4ee09af03..51b10f4d9 100644 --- a/netbox/templates/extras/eventrule.html +++ b/netbox/templates/extras/eventrule.html @@ -36,7 +36,7 @@