Просмотр исходного кода

15855 fix adding script as event rule (#15861)

* 15855 fix adding script as event rule

* 15855 fix adding script as event rule

* 15855 fix adding script as event rule

* 15855 fix adding script as event rule
Arthur Hanson 1 год назад
Родитель
Сommit
d0e0dcb652
2 измененных файлов с 2 добавлено и 3 удалено
  1. 1 2
      netbox/extras/api/serializers_/events.py
  2. 1 1
      netbox/extras/events.py

+ 1 - 2
netbox/extras/api/serializers_/events.py

@@ -47,8 +47,7 @@ class EventRuleSerializer(NetBoxModelSerializer):
         # We need to manually instantiate the serializer for scripts
         # We need to manually instantiate the serializer for scripts
         if instance.action_type == EventRuleActionChoices.SCRIPT:
         if instance.action_type == EventRuleActionChoices.SCRIPT:
             script = instance.action_object
             script = instance.action_object
-            instance = script.python_class() if script.python_class else None
-            return ScriptSerializer(instance, nested=True, context=context).data
+            return ScriptSerializer(script, nested=True, context=context).data
         else:
         else:
             serializer = get_serializer_for_model(instance.action_object_type.model_class())
             serializer = get_serializer_for_model(instance.action_object_type.model_class())
             return serializer(instance.action_object, nested=True, context=context).data
             return serializer(instance.action_object, nested=True, context=context).data

+ 1 - 1
netbox/extras/events.py

@@ -118,7 +118,7 @@ def process_event_rules(event_rules, model_name, event, data, username=None, sna
             # Enqueue a Job to record the script's execution
             # Enqueue a Job to record the script's execution
             Job.enqueue(
             Job.enqueue(
                 "extras.scripts.run_script",
                 "extras.scripts.run_script",
-                instance=script.module,
+                instance=event_rule.action_object,
                 name=script.name,
                 name=script.name,
                 user=user,
                 user=user,
                 data=data
                 data=data