mirror/netbox-community-netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2024-05-10 07:54:54 +00:00
Code Activity

Adds custom field on webhook model (#13336)

Browse Source 
* adds custom field on webhook model #11936

* adds tags on webhook model #11936

* Remove extraneous import; revert change to NetBoxModelForm (no longer needed)

---------

Co-authored-by: Jeremy Stretch <jstretch@netboxlabs.com>
This commit is contained in:
Abhimanyu Saharan
2023-08-01 23:35:47 +05:30
committed by GitHub
parent 7b998cfeb4
commit 1cc78be6ca
11 changed files with 51 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
netbox/extras/forms/bulk_edit.py
View File

@@ -3,6 +3,7 @@ from django.utils.translation import gettext_lazy as _
from extras.choices import *
from extras.models import *
from netbox.forms import NetBoxModelBulkEditForm
from utilities.forms import BulkEditForm, add_blank_choice
from utilities.forms.fields import ColorField, DynamicModelChoiceField
from utilities.forms.widgets import BulkEditNullBooleanSelect
@@ -165,7 +166,9 @@ class SavedFilterBulkEditForm(BulkEditForm):
nullable_fields = ('description',)
class WebhookBulkEditForm(BulkEditForm):
class WebhookBulkEditForm(NetBoxModelBulkEditForm):
model = Webhook
pk = forms.ModelMultipleChoiceField(
queryset=Webhook.objects.all(),
widget=forms.MultipleHiddenInput

4
netbox/extras/forms/bulk_import.py
View File

@@ -140,7 +140,7 @@ class SavedFilterImportForm(CSVModelForm):
)
class WebhookImportForm(CSVModelForm):
class WebhookImportForm(NetBoxModelImportForm):
content_types = CSVMultipleContentTypeField(
label=_('Content types'),
queryset=ContentType.objects.all(),
@@ -153,7 +153,7 @@ class WebhookImportForm(CSVModelForm):
fields = (
'name', 'enabled', 'content_types', 'type_create', 'type_update', 'type_delete', 'type_job_start',
'type_job_end', 'payload_url', 'http_method', 'http_content_type', 'additional_headers', 'body_template',
'secret', 'ssl_verification', 'ca_file_path'
'secret', 'ssl_verification', 'ca_file_path', 'tags'
)

9
netbox/extras/forms/filtersets.py
View File

@@ -16,7 +16,7 @@ from utilities.forms.fields import (
)
from utilities.forms.widgets import APISelectMultiple, DateTimePicker
from virtualization.models import Cluster, ClusterGroup, ClusterType
from .mixins import SavedFiltersMixin
from .mixins import *
__all__ = (
'ConfigContextFilterForm',
@@ -219,9 +219,12 @@ class SavedFilterFilterForm(SavedFiltersMixin, FilterForm):
)
class WebhookFilterForm(SavedFiltersMixin, FilterForm):
class WebhookFilterForm(NetBoxModelFilterSetForm):
model = Webhook
tag = TagFilterField(model)
fieldsets = (
(None, ('q', 'filter_id')),
(None, ('q', 'filter_id', 'tag')),
(_('Attributes'), ('content_type_id', 'http_method', 'enabled')),
(_('Events'), ('type_create', 'type_update', 'type_delete', 'type_job_start', 'type_job_end')),
)

4
netbox/extras/forms/model_forms.py
View File

@@ -214,7 +214,7 @@ class BookmarkForm(BootstrapMixin, forms.ModelForm):
fields = ('object_type', 'object_id')
class WebhookForm(BootstrapMixin, forms.ModelForm):
class WebhookForm(NetBoxModelForm):
content_types = ContentTypeMultipleChoiceField(
label=_('Content types'),
queryset=ContentType.objects.all(),
@@ -222,7 +222,7 @@ class WebhookForm(BootstrapMixin, forms.ModelForm):
)
fieldsets = (
(_('Webhook'), ('name', 'content_types', 'enabled')),
(_('Webhook'), ('name', 'content_types', 'enabled', 'tags')),
(_('Events'), ('type_create', 'type_update', 'type_delete', 'type_job_start', 'type_job_end')),
(_('HTTP Request'), (
'payload_url', 'http_method', 'http_content_type', 'additional_headers', 'body_template', 'secret',