From 49c6bee6d7ad87182fc9a5cfaafd38a29f334179 Mon Sep 17 00:00:00 2001 From: Glenn Matthews Date: Tue, 14 Jul 2020 09:45:36 -0400 Subject: [PATCH 1/2] Fix jobresult success label spelling --- netbox/extras/choices.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/netbox/extras/choices.py b/netbox/extras/choices.py index fe5c74fa5..033de708d 100644 --- a/netbox/extras/choices.py +++ b/netbox/extras/choices.py @@ -127,7 +127,7 @@ class TemplateLanguageChoices(ChoiceSet): class LogLevelChoices(ChoiceSet): LOG_DEFAULT = 'default' - LOG_SUCCESS = 'sucess' + LOG_SUCCESS = 'success' LOG_INFO = 'info' LOG_WARNING = 'warning' LOG_FAILURE = 'failure' From d8b0a11a496e405c0e1e198477b65e6f630f0222 Mon Sep 17 00:00:00 2001 From: Glenn Matthews Date: Tue, 14 Jul 2020 10:54:32 -0400 Subject: [PATCH 2/2] Save JobResult even for a script run with commit=False --- netbox/extras/scripts.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/netbox/extras/scripts.py b/netbox/extras/scripts.py index dd096c392..fd349dfeb 100644 --- a/netbox/extras/scripts.py +++ b/netbox/extras/scripts.py @@ -415,8 +415,6 @@ def run_script(data, request, commit=True, *args, **kwargs): try: with transaction.atomic(): script.output = script.run(**kwargs) - job_result.data = ScriptOutputSerializer(script).data - job_result.set_status(JobResultStatusChoices.STATUS_COMPLETED) if not commit: raise AbortTransaction() @@ -434,6 +432,10 @@ def run_script(data, request, commit=True, *args, **kwargs): job_result.set_status(JobResultStatusChoices.STATUS_ERRORED) finally: + if job_result.status != JobResultStatusChoices.STATUS_ERRORED: + job_result.data = ScriptOutputSerializer(script).data + job_result.set_status(JobResultStatusChoices.STATUS_COMPLETED) + if not commit: # Delete all pending changelog entries purge_changelog.send(Script)