mirror of
https://github.com/inventree/InvenTree.git
synced 2025-04-29 20:16:44 +00:00
- Instead of registry.plugins.get() - get_plugin checks registry hash - performs registry reload if necessary (cherry picked from commit e9c6dd82737832052cc647b4161658d75d6b66fd) Co-authored-by: Oliver <oliver.henry.walters@gmail.com>
This commit is contained in:
parent
75f507d4c7
commit
39176d9a19
@ -133,7 +133,7 @@ class NotificationMethod:
|
|||||||
return False
|
return False
|
||||||
|
|
||||||
# Check if method globally enabled
|
# Check if method globally enabled
|
||||||
plg_instance = registry.plugins.get(plg_cls.NAME.lower())
|
plg_instance = registry.get_plugin(plg_cls.NAME.lower())
|
||||||
if plg_instance and not plg_instance.get_setting(self.GLOBAL_SETTING):
|
if plg_instance and not plg_instance.get_setting(self.GLOBAL_SETTING):
|
||||||
return True
|
return True
|
||||||
|
|
||||||
|
@ -99,7 +99,7 @@ def process_event(plugin_slug, event, *args, **kwargs):
|
|||||||
This function is run by the background worker process.
|
This function is run by the background worker process.
|
||||||
This function may queue multiple functions to be handled by the background worker.
|
This function may queue multiple functions to be handled by the background worker.
|
||||||
"""
|
"""
|
||||||
plugin = registry.plugins.get(plugin_slug, None)
|
plugin = registry.get_plugin(plugin_slug)
|
||||||
|
|
||||||
if plugin is None: # pragma: no cover
|
if plugin is None: # pragma: no cover
|
||||||
logger.error("Could not find matching plugin for '%s'", plugin_slug)
|
logger.error("Could not find matching plugin for '%s'", plugin_slug)
|
||||||
|
@ -9,7 +9,7 @@ class EventMixin:
|
|||||||
Implementing classes must provide a "process_event" function:
|
Implementing classes must provide a "process_event" function:
|
||||||
"""
|
"""
|
||||||
|
|
||||||
def wants_process_event(self, event):
|
def wants_process_event(self, event: str) -> bool:
|
||||||
"""Function to subscribe to events.
|
"""Function to subscribe to events.
|
||||||
|
|
||||||
Return true if you're interested in the given event, false if not.
|
Return true if you're interested in the given event, false if not.
|
||||||
@ -17,7 +17,7 @@ class EventMixin:
|
|||||||
# Default implementation always returns true (backwards compatibility)
|
# Default implementation always returns true (backwards compatibility)
|
||||||
return True
|
return True
|
||||||
|
|
||||||
def process_event(self, event, *args, **kwargs):
|
def process_event(self, event: str, *args, **kwargs) -> None:
|
||||||
"""Function to handle events.
|
"""Function to handle events.
|
||||||
|
|
||||||
Must be overridden by plugin
|
Must be overridden by plugin
|
||||||
|
@ -133,7 +133,7 @@ class InvenTreeCoreNotificationsPlugin(SettingsContentMixin, SettingsMixin, Inve
|
|||||||
|
|
||||||
def send_bulk(self):
|
def send_bulk(self):
|
||||||
"""Send the notifications out via slack."""
|
"""Send the notifications out via slack."""
|
||||||
instance = registry.plugins.get(self.get_plugin().NAME.lower())
|
instance = registry.get_plugin(self.get_plugin().NAME.lower())
|
||||||
url = instance.get_setting('NOTIFICATION_SLACK_URL')
|
url = instance.get_setting('NOTIFICATION_SLACK_URL')
|
||||||
|
|
||||||
if not url:
|
if not url:
|
||||||
|
@ -18,7 +18,7 @@ class CoreNotificationTestTests(BaseNotificationIntegrationTest):
|
|||||||
self.assertEqual(len(mail.outbox), 0)
|
self.assertEqual(len(mail.outbox), 0)
|
||||||
|
|
||||||
# enable plugin and set mail setting to true
|
# enable plugin and set mail setting to true
|
||||||
plugin = registry.plugins.get('inventreecorenotificationsplugin')
|
plugin = registry.get_plugin('inventreecorenotificationsplugin')
|
||||||
plugin.set_setting('ENABLE_NOTIFICATION_EMAILS', True)
|
plugin.set_setting('ENABLE_NOTIFICATION_EMAILS', True)
|
||||||
NotificationUserSetting.set_setting(
|
NotificationUserSetting.set_setting(
|
||||||
key='NOTIFICATION_METHOD_MAIL',
|
key='NOTIFICATION_METHOD_MAIL',
|
||||||
|
Loading…
x
Reference in New Issue
Block a user