Fixed issue realted to running scripts with no task_queues set

Author: kkthxbye-code

netbox_script_manager/scripts.py

@@ -98,7 +98,7 @@ def scheduling_enabled(self):
 
     @classproperty
     def task_queues(self):
-        return getattr(self.Meta, "task_queues", None)
+        return getattr(self.Meta, "task_queues", [])
 
     @classmethod
     def _get_vars(cls):
@@ -127,7 +127,7 @@ def run(self, data, commit):
 
     # Form rendering
 
-    def get_fieldsets(self):
+    def get_fieldsets(self, instance=None):
         fieldsets = []
 
         if self.fieldsets:
@@ -140,7 +140,7 @@ def get_fieldsets(self):
         exec_parameters = ["_schedule_at", "_interval", "_task_queue", "_commit"] if self.scheduling_enabled else ["_task_queue", "_commit"]
 
         # Remove task queue field if there's no queues defined
-        if not self.task_queues:
+        if instance and not instance.task_queues:
             exec_parameters.remove("_task_queue")
 
         fieldsets.append(("Script Execution Parameters", exec_parameters))

netbox_script_manager/templates/netbox_script_manager/scriptinstance.html

@@ -39,7 +39,7 @@ <h2 class="accordion-header" id="headingTwo">
                 {% csrf_token %}
                 <div class="field-group my-4">
                   {# Render grouped fields according to declared fieldsets #}
-                  {% for group, fields in object.script.get_fieldsets %}
+                  {% for group, fields in fieldsets %}
                     {% if fields %}
                       <div class="field-group mb-5">
                         <div class="row mb-2">

netbox_script_manager/views.py

@@ -31,11 +31,13 @@ def get_extra_context(self, request, instance):
         except Exception as e:
             return {"exception": e}
 
-        return {"form": script.as_form(initial=normalize_querydict(request.GET), script_instance=instance)}
+        fieldsets = script.get_fieldsets(instance=instance)
+        return {"form": script.as_form(initial=normalize_querydict(request.GET), script_instance=instance), "fieldsets": fieldsets}
 
     def post(self, request, pk):
         instance = self.get_object(pk=pk)
         form = instance.script.as_form(request.POST, script_instance=instance)
+        fieldsets = instance.script.get_fieldsets(instance=instance)
 
         if form.is_valid():
             schedule_at = form.cleaned_data.pop("_schedule_at")
@@ -91,7 +93,7 @@ def post(self, request, pk):
 
             return redirect("plugins:netbox_script_manager:scriptexecution", pk=script_execution.pk)
 
-        return render(request, "netbox_script_manager/scriptinstance.html", {"form": form, "object": instance})
+        return render(request, "netbox_script_manager/scriptinstance.html", {"form": form, "object": instance, "fieldsets": fieldsets})
 
 
 class ScriptInstanceListView(generic.ObjectListView):