Mirrored_Repos/InvenTree
1
0
Fork 0
mirror of https://github.com/inventree/InvenTree synced 2024-08-30 18:33:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "remove url load setting for plugin"

Browse Source 
This reverts commit e37477eb15.
This commit is contained in:
Matthias 2021-10-19 21:39:58 +02:00
parent f86bd4dd6b
commit 1c93a126ae
No known key found for this signature in database
GPG Key ID: F50EF5741D33E076
3 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
InvenTree/InvenTree/urls.py
View File

@ -43,6 +43,7 @@ from .views import AppearanceSelectView, SettingCategorySelectView
from .views import DynamicJsView from .views import DynamicJsView
from common.views import SettingEdit, UserSettingEdit from common.views import SettingEdit, UserSettingEdit
from common.models import InvenTreeSetting
from .api import InfoView, NotFoundView from .api import InfoView, NotFoundView
from .api import ActionPluginView from .api import ActionPluginView
@ -126,9 +127,15 @@ translated_javascript_urls = [
# Integration plugin urls # Integration plugin urls
interation_urls = [] interation_urls = []
for plugin in settings.INTEGRATION_PLUGINS.values(): plugin_url_enabled = False
if plugin.mixin_enabled('urls'): try:
interation_urls.append(plugin.urlpatterns) 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)
urlpatterns = [ urlpatterns = [
url(r'^part/', include(part_urls)), url(r'^part/', include(part_urls)),

6
InvenTree/common/models.py
View File

@ -875,6 +875,12 @@ class InvenTreeSetting(BaseInvenTreeSetting):
'default': '', 'default': '',
'choices': settings_group_options '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': { 'ENABLE_PLUGINS_NAVIGATION': {
'name': _('Enable navigation integration'), 'name': _('Enable navigation integration'),
'description': _('Enable plugins to integrate into navigation'), 'description': _('Enable plugins to integrate into navigation'),

1
InvenTree/templates/InvenTree/settings/plugin.html
View File

@ -19,6 +19,7 @@
<table class='table table-striped table-condensed'> <table class='table table-striped table-condensed'>
{% include "InvenTree/settings/header.html" %} {% include "InvenTree/settings/header.html" %}
<tbody> <tbody>
{% 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_NAVIGATION" %}
{% include "InvenTree/settings/setting.html" with key="ENABLE_PLUGINS_SETTING"%} {% include "InvenTree/settings/setting.html" with key="ENABLE_PLUGINS_SETTING"%}
{% include "InvenTree/settings/setting.html" with key="ENABLE_PLUGINS_APP"%} {% include "InvenTree/settings/setting.html" with key="ENABLE_PLUGINS_APP"%}