From dd31706c3553d1dbc0a8dcffecf09db785b9a9a1 Mon Sep 17 00:00:00 2001 From: Arthur Hanson Date: Fri, 14 Jun 2024 15:59:23 -0700 Subject: [PATCH] 16149 review changes --- netbox/extras/scripts.py | 4 +--- netbox/extras/tables/tables.py | 5 +---- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/netbox/extras/scripts.py b/netbox/extras/scripts.py index e83647711..ae27aa0fb 100644 --- a/netbox/extras/scripts.py +++ b/netbox/extras/scripts.py @@ -507,9 +507,7 @@ class BaseScript: # Record to the system log if obj: message = f"{obj}: {message}" - self.logger.log(LogLevelChoices.SYSTEM_LEVELS[level], f"{obj}: {message}") - else: - self.logger.log(LogLevelChoices.SYSTEM_LEVELS[level], message) + self.logger.log(LogLevelChoices.SYSTEM_LEVELS[level], message) def log_debug(self, message, obj=None): self._log(message, obj, level=LogLevelChoices.LOG_DEBUG) diff --git a/netbox/extras/tables/tables.py b/netbox/extras/tables/tables.py index 4a9d09aa1..a120f7f53 100644 --- a/netbox/extras/tables/tables.py +++ b/netbox/extras/tables/tables.py @@ -549,9 +549,6 @@ class ScriptResultsTable(BaseTable): object = tables.Column( verbose_name=_('Object') ) - url = tables.Column( - verbose_name=_('URL') - ) message = columns.MarkdownColumn( verbose_name=_('Message') ) @@ -559,7 +556,7 @@ class ScriptResultsTable(BaseTable): class Meta(BaseTable.Meta): empty_text = _(EMPTY_TABLE_TEXT) fields = ( - 'index', 'time', 'status', 'object', 'url', 'message', + 'index', 'time', 'status', 'object', 'message', ) default_columns = ( 'index', 'time', 'status', 'object', 'message',