From 28bc43ee4a6fc8482fa7ce55f567286331693a74 Mon Sep 17 00:00:00 2001 From: Arthur Hanson Date: Thu, 18 Jul 2024 15:52:14 +0700 Subject: [PATCH] 14731 tweaks --- netbox/core/plugins.py | 1 - netbox/core/views.py | 3 +++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/netbox/core/plugins.py b/netbox/core/plugins.py index 51be3c3dc..afd47e17e 100644 --- a/netbox/core/plugins.py +++ b/netbox/core/plugins.py @@ -150,7 +150,6 @@ def get_catalog_plugins(): def get_plugins(): local_plugins = get_local_plugins() catalog_plugins = cache.get('plugins-catalog-feed') - catalog_plugins = None if not catalog_plugins: catalog_plugins = get_catalog_plugins() cache.set('plugins-catalog-feed', catalog_plugins, 3600) diff --git a/netbox/core/views.py b/netbox/core/views.py index 88821de75..3848d02d3 100644 --- a/netbox/core/views.py +++ b/netbox/core/views.py @@ -653,6 +653,9 @@ class PluginListView(UserPassesTestMixin, View): q = request.GET.get('q', None) plugins = get_plugins().values() + if settings.RELEASE.edition != 'Community': + plugins = [obj for obj in plugins if obj.is_local or obj.release_latest.is_netboxlabs_supported] + if q: plugins = [obj for obj in plugins if q.casefold() in obj.name.casefold()]