Merge b12bfaa597 into 5af3c659a5

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
             Job.enqueue(
                 "extras.scripts.run_script",
-                instance=event_rule.action_object,
+                instance=script.module,
                 name=script.name,
                 user=user,
                 data=data

netbox/utilities/templatetags/builtins/filters.py

@@ -5,7 +5,7 @@ import re
 import yaml
 from django import template
 from django.contrib.contenttypes.models import ContentType
-from django.contrib.humanize.templatetags.humanize import naturalday, naturaltime
+from django.contrib.humanize.templatetags.humanize import naturaltime
 from django.utils.html import escape
 from django.utils.safestring import mark_safe
 from markdown import markdown
@@ -216,12 +216,11 @@ def render_yaml(value):
 def isodate(value):
     if type(value) is datetime.date:
         text = value.isoformat()
-        return mark_safe(f'<span title="{naturalday(value)}">{text}</span>')
     elif type(value) is datetime.datetime:
         text = value.date().isoformat()
-        return mark_safe(f'<span title="{naturaltime(value)}">{text}</span>')
     else:
         return ''
+    return mark_safe(f'<span title="{naturaltime(value)}">{text}</span>')
 
 
 @register.filter()