From 8b38f2fc7598d85ff32d25556206d1368d69c8ff Mon Sep 17 00:00:00 2001 From: Arthur Hanson Date: Fri, 16 Aug 2024 21:00:40 +0700 Subject: [PATCH] 17174 add version to plugin catalog --- netbox/core/plugins.py | 1 + netbox/core/tables/plugins.py | 13 +++++++------ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/netbox/core/plugins.py b/netbox/core/plugins.py index 98801d7e9..1fcb37f2b 100644 --- a/netbox/core/plugins.py +++ b/netbox/core/plugins.py @@ -96,6 +96,7 @@ def get_local_plugins(plugins=None): if k in plugins: plugins[k].is_local = True plugins[k].is_installed = True + plugins[k].installed_version = v.installed_version else: plugins[k] = v diff --git a/netbox/core/tables/plugins.py b/netbox/core/tables/plugins.py index 30c7ad408..d3de7cdfe 100644 --- a/netbox/core/tables/plugins.py +++ b/netbox/core/tables/plugins.py @@ -56,11 +56,12 @@ class CatalogPluginTable(BaseTable): is_certified = columns.BooleanColumn( verbose_name=_('Certified') ) - created_at = columns.DateTimeColumn( - verbose_name=_('Published') + installed_version = tables.Column( + verbose_name=_('Installed Version') ) - updated_at = columns.DateTimeColumn( - verbose_name=_('Updated') + latest_version = tables.Column( + accessor=tables.A('release_latest__version'), + verbose_name=_('Latest Version') ) installed_version = tables.Column( verbose_name=_('Installed version') @@ -69,11 +70,11 @@ class CatalogPluginTable(BaseTable): class Meta(BaseTable.Meta): empty_text = _('No plugin data found') fields = ( - 'title_long', 'author', 'is_local', 'is_installed', 'is_certified', 'created_at', 'updated_at', + 'title_long', 'author', 'is_local', 'is_installed', 'is_certified', 'installed_version', 'latest_version', 'installed_version', ) default_columns = ( - 'title_long', 'author', 'is_local', 'is_installed', 'is_certified', 'created_at', 'updated_at', + 'title_long', 'author', 'is_local', 'is_installed', 'is_certified', 'installed_version', 'latest_version', ) # List installed plugins first, then certified plugins, then # everything else (with each tranche ordered alphabetically)