From e37477eb156f243a0ca1c321c80c82f59735fef8 Mon Sep 17 00:00:00 2001 From: Matthias Date: Tue, 19 Oct 2021 19:54:20 +0200 Subject: [PATCH] remove url load setting for plugin --- InvenTree/InvenTree/urls.py | 12 +++--------- InvenTree/common/models.py | 6 ------ InvenTree/templates/InvenTree/settings/plugin.html | 1 - 3 files changed, 3 insertions(+), 16 deletions(-) diff --git a/InvenTree/InvenTree/urls.py b/InvenTree/InvenTree/urls.py index e181d130fa..e70dbf8434 100644 --- a/InvenTree/InvenTree/urls.py +++ b/InvenTree/InvenTree/urls.py @@ -127,15 +127,9 @@ translated_javascript_urls = [ # Integration plugin urls interation_urls = [] -plugin_url_enabled = False -try: - plugin_url_enabled = InvenTreeSetting.get_setting('ENABLE_PLUGINS_URL') -except Exception as _e: - print(_e) -if settings.TESTING or plugin_url_enabled: - for plugin in settings.INTEGRATION_PLUGINS.values(): - if plugin.mixin_enabled('urls'): - interation_urls.append(plugin.urlpatterns) +for plugin in settings.INTEGRATION_PLUGINS.values(): + if plugin.mixin_enabled('urls'): + interation_urls.append(plugin.urlpatterns) urlpatterns = [ url(r'^part/', include(part_urls)), diff --git a/InvenTree/common/models.py b/InvenTree/common/models.py index 630a8d03da..3e2f787457 100644 --- a/InvenTree/common/models.py +++ b/InvenTree/common/models.py @@ -875,12 +875,6 @@ class InvenTreeSetting(BaseInvenTreeSetting): 'default': '', 'choices': settings_group_options }, - 'ENABLE_PLUGINS_URL': { - 'name': _('Enable URL integration'), - 'description': _('Enable plugins to add URL routes'), - 'default': False, - 'validator': bool, - }, 'ENABLE_PLUGINS_NAVIGATION': { 'name': _('Enable navigation integration'), 'description': _('Enable plugins to integrate into navigation'), diff --git a/InvenTree/templates/InvenTree/settings/plugin.html b/InvenTree/templates/InvenTree/settings/plugin.html index acacbdff4d..a7f63a65ef 100644 --- a/InvenTree/templates/InvenTree/settings/plugin.html +++ b/InvenTree/templates/InvenTree/settings/plugin.html @@ -19,7 +19,6 @@ {% include "InvenTree/settings/header.html" %} - {% include "InvenTree/settings/setting.html" with key="ENABLE_PLUGINS_URL" %} {% include "InvenTree/settings/setting.html" with key="ENABLE_PLUGINS_NAVIGATION" %} {% include "InvenTree/settings/setting.html" with key="ENABLE_PLUGINS_SETTING"%} {% include "InvenTree/settings/setting.html" with key="ENABLE_PLUGINS_APP"%}