inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2025-05-03 22:08:49 +00:00
Code

Registry name fixes

Browse Source
This commit is contained in:
Oliver 2021-12-31 14:28:16 +11:00
parent 02e0ea6e3a
commit 4b4d4be13e
3 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
InvenTree/plugin/builtin/integration/mixins.py
View File

@ -17,14 +17,8 @@ class SettingsMixin:
def __init__(self): def __init__(self):
super().__init__() super().__init__()
self.add_mixin('globalsettings', 'has_globalsettings', __class__) self.add_mixin('settings', 'has_globalsettings', __class__)
self.globalsettings = self.setup_globalsettings() self.globalsettings = getattr(self, 'SETTINGS', None)
def setup_globalsettings(self):
"""
Setup global settings for this plugin
"""
return getattr(self, 'SETTINGS', None)
@property @property
def has_globalsettings(self): def has_globalsettings(self):

2
InvenTree/plugin/registry.py
View File

@ -251,7 +251,7 @@ class Plugins:
if settings.PLUGIN_TESTING or InvenTreeSetting.get_setting('ENABLE_PLUGINS_GLOBALSETTING'): if settings.PLUGIN_TESTING or InvenTreeSetting.get_setting('ENABLE_PLUGINS_GLOBALSETTING'):
logger.info('Registering IntegrationPlugin global settings') logger.info('Registering IntegrationPlugin global settings')
for slug, plugin in plugins: for slug, plugin in plugins:
if plugin.mixin_enabled('globalsettings'): if plugin.mixin_enabled('settings'):
plugin_setting = plugin.globalsettingspatterns plugin_setting = plugin.globalsettingspatterns
self.mixins_globalsettings[slug] = plugin_setting self.mixins_globalsettings[slug] = plugin_setting

10
InvenTree/plugin/test_integration.py
View File

@ -8,7 +8,7 @@ from django.contrib.auth import get_user_model
from datetime import datetime from datetime import datetime
from plugin import IntegrationPluginBase from plugin import IntegrationPluginBase
from plugin.mixins import AppMixin, GlobalSettingsMixin, UrlsMixin, NavigationMixin from plugin.mixins import AppMixin, SettingsMixin, UrlsMixin, NavigationMixin
from plugin.urls import PLUGIN_BASE from plugin.urls import PLUGIN_BASE
@ -20,19 +20,19 @@ class BaseMixinDefinition:
self.assertEqual(self.mixin.registered_mixins[0]['human_name'], self.MIXIN_HUMAN_NAME) self.assertEqual(self.mixin.registered_mixins[0]['human_name'], self.MIXIN_HUMAN_NAME)
class GlobalSettingsMixinTest(BaseMixinDefinition, TestCase): class SettingsMixinTest(BaseMixinDefinition, TestCase):
MIXIN_HUMAN_NAME = 'Settings' MIXIN_HUMAN_NAME = 'Settings'
MIXIN_NAME = 'globalsettings' MIXIN_NAME = 'settings'
MIXIN_ENABLE_CHECK = 'has_globalsettings' MIXIN_ENABLE_CHECK = 'has_globalsettings'
TEST_SETTINGS = {'SETTING1': {'default': '123', }} TEST_SETTINGS = {'SETTING1': {'default': '123', }}
def setUp(self): def setUp(self):
class SettingsCls(GlobalSettingsMixin, IntegrationPluginBase): class SettingsCls(SettingsMixin, IntegrationPluginBase):
GLOBALSETTINGS = self.TEST_SETTINGS GLOBALSETTINGS = self.TEST_SETTINGS
self.mixin = SettingsCls() self.mixin = SettingsCls()
class NoSettingsCls(GlobalSettingsMixin, IntegrationPluginBase): class NoSettingsCls(SettingsMixin, IntegrationPluginBase):
pass pass
self.mixin_nothing = NoSettingsCls() self.mixin_nothing = NoSettingsCls()