NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-07-25 01:48:38 -06:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Fixes #14892: Omit username when running report/script via command line

Browse Source
This commit is contained in:
Jeremy Stretch 2024-01-22 14:13:35 -05:00
parent ff752dac07
commit d606749335
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
netbox/extras/events.py
View File

@ -71,10 +71,10 @@ def enqueue_object(queue, instance, user, request_id, action):
}) })
def process_event_rules(event_rules, model_name, event, data, username, snapshots=None, request_id=None): def process_event_rules(event_rules, model_name, event, data, username=None, snapshots=None, request_id=None):
try: if username:
user = get_user_model().objects.get(username=username) user = get_user_model().objects.get(username=username)
except ObjectDoesNotExist: else:
user = None user = None
for event_rule in event_rules: for event_rule in event_rules:

6
netbox/extras/signals.py
View File

@ -251,7 +251,8 @@ def process_job_start_event_rules(sender, **kwargs):
Process event rules for jobs starting. Process event rules for jobs starting.
""" """
event_rules = EventRule.objects.filter(type_job_start=True, enabled=True, content_types=sender.object_type) event_rules = EventRule.objects.filter(type_job_start=True, enabled=True, content_types=sender.object_type)
process_event_rules(event_rules, sender.object_type.model, EVENT_JOB_START, sender.data, sender.user.username) username = sender.user.username if sender.user else None
process_event_rules(event_rules, sender.object_type.model, EVENT_JOB_START, sender.data, username)
@receiver(job_end) @receiver(job_end)
@ -260,4 +261,5 @@ def process_job_end_event_rules(sender, **kwargs):
Process event rules for jobs terminating. Process event rules for jobs terminating.
""" """
event_rules = EventRule.objects.filter(type_job_end=True, enabled=True, content_types=sender.object_type) event_rules = EventRule.objects.filter(type_job_end=True, enabled=True, content_types=sender.object_type)
process_event_rules(event_rules, sender.object_type.model, EVENT_JOB_END, sender.data, sender.user.username) username = sender.user.username if sender.user else None
process_event_rules(event_rules, sender.object_type.model, EVENT_JOB_END, sender.data, username)