From d0a2529013a08919e576a685b06607426f9c3a9e Mon Sep 17 00:00:00 2001 From: Arthur Date: Thu, 16 Nov 2023 14:07:01 -0800 Subject: [PATCH] 14132 form fixes --- netbox/extras/filtersets.py | 4 +++- netbox/extras/forms/bulk_import.py | 4 ++-- netbox/extras/forms/model_forms.py | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/netbox/extras/filtersets.py b/netbox/extras/filtersets.py index 9fd88c9fa..676d3f1a9 100644 --- a/netbox/extras/filtersets.py +++ b/netbox/extras/filtersets.py @@ -80,7 +80,9 @@ class EventRuleFilterSet(NetBoxModelFilterSet): if not value.strip(): return queryset return queryset.filter( - Q(name__icontains=value) + Q(name__icontains=value) | + Q(description__icontains=value) | + Q(comments__icontains=value) ) diff --git a/netbox/extras/forms/bulk_import.py b/netbox/extras/forms/bulk_import.py index 4c941bba2..871b38e9d 100644 --- a/netbox/extras/forms/bulk_import.py +++ b/netbox/extras/forms/bulk_import.py @@ -156,8 +156,8 @@ class EventRuleImportForm(NetBoxModelImportForm): class Meta: model = EventRule fields = ( - 'name', 'enabled', 'content_types', 'type_create', 'type_update', 'type_delete', 'type_job_start', - 'type_job_end', 'tags' + 'name', 'description', 'enabled', 'content_types', 'type_create', 'type_update', 'type_delete', 'type_job_start', + 'type_job_end', 'comments', 'tags' ) diff --git a/netbox/extras/forms/model_forms.py b/netbox/extras/forms/model_forms.py index 0832a55ea..7b9f0bb02 100644 --- a/netbox/extras/forms/model_forms.py +++ b/netbox/extras/forms/model_forms.py @@ -246,7 +246,7 @@ class EventRuleForm(NetBoxModelForm): ) fieldsets = ( - (_('EventRule'), ('name', 'content_types', 'enabled', 'tags')), + (_('EventRule'), ('name', 'description', 'content_types', 'enabled', 'tags')), (_('Events'), ('type_create', 'type_update', 'type_delete', 'type_job_start', 'type_job_end')), (_('Conditions'), ('conditions',)), (_('Action'), ('action_type', 'action_choice', 'action_parameters', 'action_object_type', 'action_object_id', 'action_data')),