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

move flags

Browse Source
This commit is contained in:
Matthias 2021-11-20 18:07:05 +01:00
parent 3aa40ce3e9
commit 308348f051
No known key found for this signature in database
GPG Key ID: F50EF5741D33E076
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
InvenTree/InvenTree/settings.py
View File

@ -885,7 +885,6 @@ PLUGINS = []
INTEGRATION_PLUGIN_GLOBALSETTING = {} INTEGRATION_PLUGIN_GLOBALSETTING = {}
INTEGRATION_APPS_LOADING = True # Marks if apps were reloaded yet INTEGRATION_APPS_LOADING = True # Marks if apps were reloaded yet
INTEGRATION_PLUGINS_RELOADING = False
INTEGRATION_APPS_PATHS = [] # Holds all added plugin_paths INTEGRATION_APPS_PATHS = [] # Holds all added plugin_paths
INTEGRATION_ERRORS = {} # Holds discovering errors INTEGRATION_ERRORS = {} # Holds discovering errors

2
InvenTree/plugin/apps.py
View File

@ -11,6 +11,6 @@ class PluginAppConfig(AppConfig):
name = 'plugin' name = 'plugin'
def ready(self): def ready(self):
if not settings.INTEGRATION_PLUGINS_RELOADING: if not plugins.is_loading:
plugins.collect_plugins() plugins.collect_plugins()
plugins.load_plugins() plugins.load_plugins()

8
InvenTree/plugin/registry.py
View File

@ -35,9 +35,13 @@ logger = logging.getLogger('inventree')
class Plugins: class Plugins:
def __init__(self) -> None: def __init__(self) -> None:
# plugin registry
self.plugins = {} self.plugins = {}
self.plugins_inactive = {} self.plugins_inactive = {}
# flags
self.is_loading = False
# region public plugin functions # region public plugin functions
def load_plugins(self): def load_plugins(self):
"""load and activate all IntegrationPlugins""" """load and activate all IntegrationPlugins"""
@ -393,9 +397,9 @@ class Plugins:
apps.clear_cache() apps.clear_cache()
self._try_reload(apps.populate, settings.INSTALLED_APPS) self._try_reload(apps.populate, settings.INSTALLED_APPS)
settings.INTEGRATION_PLUGINS_RELOADING = True self.is_loading = True
self._try_reload(apps.set_installed_apps, settings.INSTALLED_APPS) self._try_reload(apps.set_installed_apps, settings.INSTALLED_APPS)
settings.INTEGRATION_PLUGINS_RELOADING = False self.is_loading = False
def _try_reload(self, cmd, *args, **kwargs): def _try_reload(self, cmd, *args, **kwargs):
""" """