From 211a8e27e6adf4d0f60d346af0d9d1aa9e5290b4 Mon Sep 17 00:00:00 2001 From: Matthias Date: Sun, 21 Nov 2021 20:13:58 +0100 Subject: [PATCH] use pluginreg to reload everywhere --- InvenTree/plugin/admin.py | 5 ++--- InvenTree/plugin/models.py | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/InvenTree/plugin/admin.py b/InvenTree/plugin/admin.py index beef26a20e..6e200d8aaa 100644 --- a/InvenTree/plugin/admin.py +++ b/InvenTree/plugin/admin.py @@ -5,7 +5,7 @@ from django.contrib import admin from django.apps import apps import plugin.models as models - +from plugin import plugin_reg def plugin_update(queryset, new_status: bool): """general function for bulk changing plugins""" @@ -20,8 +20,7 @@ def plugin_update(queryset, new_status: bool): # reload plugins if they changed if apps_changed: - app = apps.get_app_config('plugin') - app.reload_plugins() + plugin_reg.reload_plugins() @admin.action(description='Activate plugin(s)') diff --git a/InvenTree/plugin/models.py b/InvenTree/plugin/models.py index 19aacad7b7..f3990c58c1 100644 --- a/InvenTree/plugin/models.py +++ b/InvenTree/plugin/models.py @@ -83,13 +83,12 @@ class PluginConfig(models.Model): reload = kwargs.pop('no_reload', False) # check if no_reload flag is set ret = super().save(force_insert, force_update, *args, **kwargs) - app = apps.get_app_config('plugin') if not reload: if self.active is False and self.__org_active is True: - app.reload_plugins() + plugin_reg.reload_plugins() elif self.active is True and self.__org_active is False: - app.reload_plugins() + plugin_reg.reload_plugins() return ret