From c38fa7f9d3f382ef68e161544325ceef1fdd06d9 Mon Sep 17 00:00:00 2001 From: Arthur Hanson Date: Mon, 8 Jul 2024 21:19:13 +0700 Subject: [PATCH] 14731 fix detail view --- netbox/core/views.py | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/netbox/core/views.py b/netbox/core/views.py index 4213241c7..8f5826520 100644 --- a/netbox/core/views.py +++ b/netbox/core/views.py @@ -740,12 +740,12 @@ def get_catalog_plugins(plugins): versions = [] versions.append(data['release_latest']) versions.extend(data['release_recent_history']) - if data['config_name'] in plugins: - plugins[data['config_name']]['is_local'] = False - plugins[data['config_name']]['is_certified'] = data['release_latest']['is_certified'] - plugins[data['config_name']]['description_short'] = data['description_short'] + if data['slug'] in plugins: + plugins[data['slug']]['is_local'] = False + plugins[data['slug']]['is_certified'] = data['release_latest']['is_certified'] + plugins[data['slug']]['description_short'] = data['description_short'] else: - plugins[data['config_name']] = { + plugins[data['slug']] = { 'slug': data['slug'], 'config_name': data['config_name'], 'name': data['title_short'], @@ -772,8 +772,6 @@ def get_plugins(): plugins = {} plugins = get_local_plugins(plugins) plugins = get_catalog_plugins(plugins) - plugins = [v for k, v in plugins.items()] - plugins = sorted(plugins, key=lambda d: d['name']) cache.set('plugins-catalog-feed', plugins, 3600) return plugins @@ -788,6 +786,8 @@ class PluginListView(UserPassesTestMixin, View): # Plugins plugins = get_plugins() + plugins = [v for k, v in plugins.items()] + plugins = sorted(plugins, key=lambda d: d['name']) return render(request, 'core/plugin_list.html', { 'plugins': plugins, @@ -801,11 +801,7 @@ class PluginView(UserPassesTestMixin, View): def get(self, request, name): - # Plugins - plugins = {} - plugins = get_local_plugins(plugins) - plugins = get_catalog_plugins(plugins) - + plugins = get_plugins() plugin = plugins[name] table = CertifiedPluginTable(plugin['versions'], user=request.user)