NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-08-08 16:48:16 -06:00
Code Issues Actions 12 Packages Projects Releases Wiki Activity

14731 fix detail view

Browse Source
This commit is contained in:
Arthur Hanson 2024-07-08 21:19:13 +07:00
parent 3eacf360fc
commit c38fa7f9d3
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
netbox/core/views.py
View File

@ -740,12 +740,12 @@ def get_catalog_plugins(plugins):
versions = [] versions = []
versions.append(data['release_latest']) versions.append(data['release_latest'])
versions.extend(data['release_recent_history']) versions.extend(data['release_recent_history'])
if data['config_name'] in plugins: if data['slug'] in plugins:
plugins[data['config_name']]['is_local'] = False plugins[data['slug']]['is_local'] = False
plugins[data['config_name']]['is_certified'] = data['release_latest']['is_certified'] plugins[data['slug']]['is_certified'] = data['release_latest']['is_certified']
plugins[data['config_name']]['description_short'] = data['description_short'] plugins[data['slug']]['description_short'] = data['description_short']
else: else:
plugins[data['config_name']] = { plugins[data['slug']] = {
'slug': data['slug'], 'slug': data['slug'],
'config_name': data['config_name'], 'config_name': data['config_name'],
'name': data['title_short'], 'name': data['title_short'],
@ -772,8 +772,6 @@ def get_plugins():
plugins = {} plugins = {}
plugins = get_local_plugins(plugins) plugins = get_local_plugins(plugins)
plugins = get_catalog_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) cache.set('plugins-catalog-feed', plugins, 3600)
return plugins return plugins
@ -788,6 +786,8 @@ class PluginListView(UserPassesTestMixin, View):
# Plugins # Plugins
plugins = get_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', { return render(request, 'core/plugin_list.html', {
'plugins': plugins, 'plugins': plugins,
@ -801,11 +801,7 @@ class PluginView(UserPassesTestMixin, View):
def get(self, request, name): def get(self, request, name):
# Plugins plugins = get_plugins()
plugins = {}
plugins = get_local_plugins(plugins)
plugins = get_catalog_plugins(plugins)
plugin = plugins[name] plugin = plugins[name]
table = CertifiedPluginTable(plugin['versions'], user=request.user) table = CertifiedPluginTable(plugin['versions'], user=request.user)