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

Fixes #14550: Fix changing event rule action type from webhook to script (#14571)

Browse Source 
* Fixes #14550: Fix changing event rule action type from webhook to script

* Remove action_parameters from form; set on instance under save()
This commit is contained in:
Jeremy Stretch
2023-12-22 09:54:08 -05:00
committed by GitHub
parent 58f925c261
commit 00807d1e52
1 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -269,8 +269,7 @@ class EventRuleForm(NetBoxModelForm):
(_('Events'), ('type_create', 'type_update', 'type_delete', 'type_job_start', 'type_job_end')), (_('Events'), ('type_create', 'type_update', 'type_delete', 'type_job_start', 'type_job_end')),
(_('Conditions'), ('conditions',)), (_('Conditions'), ('conditions',)),
(_('Action'), ( (_('Action'), (
'action_type', 'action_choice', 'action_parameters', 'action_object_type', 'action_object_id', 'action_type', 'action_choice', 'action_object_type', 'action_object_id', 'action_data',
'action_data',
)), )),
) )
@ -279,7 +278,7 @@ class EventRuleForm(NetBoxModelForm):
fields = ( fields = (
'content_types', 'name', 'description', 'type_create', 'type_update', 'type_delete', 'type_job_start', 'content_types', 'name', 'description', 'type_create', 'type_update', 'type_delete', 'type_job_start',
'type_job_end', 'enabled', 'conditions', 'action_type', 'action_object_type', 'action_object_id', 'type_job_end', 'enabled', 'conditions', 'action_type', 'action_object_type', 'action_object_id',
'action_parameters', 'action_data', 'comments', 'tags' 'action_data', 'comments', 'tags'
) )
labels = { labels = {
'type_create': _('Creations'), 'type_create': _('Creations'),
@ -293,7 +292,6 @@ class EventRuleForm(NetBoxModelForm):
'action_type': HTMXSelect(), 'action_type': HTMXSelect(),
'action_object_type': forms.HiddenInput, 'action_object_type': forms.HiddenInput,
'action_object_id': forms.HiddenInput, 'action_object_id': forms.HiddenInput,
'action_parameters': forms.HiddenInput,
} }
def init_script_choice(self): def init_script_choice(self):
@ -307,16 +305,16 @@ class EventRuleForm(NetBoxModelForm):
choices.append((str(module), scripts)) choices.append((str(module), scripts))
self.fields['action_choice'].choices = choices self.fields['action_choice'].choices = choices
if self.instance.pk: if self.instance.action_type == EventRuleActionChoices.SCRIPT and self.instance.action_parameters:
scriptmodule_id = self.instance.action_object_id scriptmodule_id = self.instance.action_object_id
script_name = self.instance.action_parameters.get('script_name') script_name = self.instance.action_parameters.get('script_name')
self.fields['action_choice'].initial = f'{scriptmodule_id}:{script_name}' self.fields['action_choice'].initial = f'{scriptmodule_id}:{script_name}'
print(self.fields['action_choice'].initial)
def init_webhook_choice(self): def init_webhook_choice(self):
initial = None initial = None
if self.fields['action_object_type'] and get_field_value(self, 'action_object_id'): if self.instance.action_type == EventRuleActionChoices.WEBHOOK:
initial = Webhook.objects.get(pk=get_field_value(self, 'action_object_id')) webhook_id = get_field_value(self, 'action_object_id')
initial = Webhook.objects.get(pk=webhook_id) if webhook_id else None
self.fields['action_choice'] = DynamicModelChoiceField( self.fields['action_choice'] = DynamicModelChoiceField(
label=_('Webhook'), label=_('Webhook'),
queryset=Webhook.objects.all(), queryset=Webhook.objects.all(),
@ -353,12 +351,21 @@ class EventRuleForm(NetBoxModelForm):
) )
module_id, script_name = action_choice.split(":", maxsplit=1) module_id, script_name = action_choice.split(":", maxsplit=1)
self.cleaned_data['action_object_id'] = module_id self.cleaned_data['action_object_id'] = module_id
self.cleaned_data['action_parameters'] = {
'script_name': script_name,
}
return self.cleaned_data return self.cleaned_data
def save(self, *args, **kwargs):
# Set action_parameters on the instance
if self.cleaned_data['action_type'] == EventRuleActionChoices.SCRIPT:
module_id, script_name = self.cleaned_data.get('action_choice').split(":", maxsplit=1)
self.instance.action_parameters = {
'script_name': script_name,
}
else:
self.instance.action_parameters = None
return super().save(*args, **kwargs)
class TagForm(BootstrapMixin, forms.ModelForm): class TagForm(BootstrapMixin, forms.ModelForm):
slug = SlugField() slug = SlugField()