inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2025-10-30 20:55:42 +00:00
Code Activity

mkae user setting access simpler

Browse Source
This commit is contained in:
Matthias
2022-04-06 23:58:11 +02:00
parent 547c51b81b
commit 4c1a0ea9ce
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
InvenTree/common/notifications.py
View File

@@ -114,6 +114,12 @@ class NotificationMethod:
# Lets go! # Lets go!
return False return False
def usersetting(self, target):
"""
Returns setting for this method for a given user
"""
return NotificationUserSetting.get_setting(f'NOTIFICATION_METHOD_{self.METHOD_NAME.upper()}', user=target, method=self.METHOD_NAME)
# endregion # endregion
@@ -220,7 +226,7 @@ def trigger_notifaction(obj, category=None, obj_ref='pk', **kwargs):
if NotificationEntry.check_recent(category, obj_ref_value, delta): if NotificationEntry.check_recent(category, obj_ref_value, delta):
logger.info(f"Notification '{category}' has recently been sent for '{str(obj)}' - SKIPPING") logger.info(f"Notification '{category}' has recently been sent for '{str(obj)}' - SKIPPING")
return # return
logger.info(f"Gathering users for notification '{category}'") logger.info(f"Gathering users for notification '{category}'")
# Collect possible targets # Collect possible targets

3
InvenTree/plugin/builtin/integration/core_notifications.py
View File

@@ -7,7 +7,6 @@ from allauth.account.models import EmailAddress
from plugin import IntegrationPluginBase from plugin import IntegrationPluginBase
from plugin.mixins import BulkNotificationMethod, SettingsMixin from plugin.mixins import BulkNotificationMethod, SettingsMixin
from plugin.models import NotificationUserSetting
import InvenTree.tasks import InvenTree.tasks
@@ -59,7 +58,7 @@ class CoreNotificationsPlugin(SettingsMixin, IntegrationPluginBase):
allowed_users = [] allowed_users = []
for user in self.targets: for user in self.targets:
allows_emails = NotificationUserSetting.get_setting('NOTIFICATION_METHOD_MAIL', user=user, method=self.METHOD_NAME) allows_emails = self.usersetting(user)
if allows_emails: if allows_emails:
allowed_users.append(user) allowed_users.append(user)