From 4819bb7194d84f780472337ff272b873b62f5adc Mon Sep 17 00:00:00 2001 From: Mikko Nieminen Date: Thu, 25 Apr 2024 10:33:36 +0200 Subject: [PATCH] refactor adminalerts email address retrieval (#415) --- adminalerts/views.py | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/adminalerts/views.py b/adminalerts/views.py index d39690c7..adb12f32 100644 --- a/adminalerts/views.py +++ b/adminalerts/views.py @@ -18,7 +18,7 @@ # Projectroles dependency from projectroles.app_settings import AppSettingAPI -from projectroles.email import get_email_user, send_generic_mail +from projectroles.email import get_email_user, get_user_addr, send_generic_mail from projectroles.views import ( LoggedInPermissionMixin, HTTPRefererMixin, @@ -105,16 +105,8 @@ def _get_email_recipients(cls, alert): if not u.email: logger.warning('No email set for user: {}'.format(u.username)) continue - if u.email not in ret: - ret.append(u.email) - alt_emails = app_settings.get( - 'projectroles', 'user_email_additional', user=u - ) - if not alt_emails: - continue - for e in alt_emails.split(';'): - if e not in ret: - ret.append(e) + user_emails = get_user_addr(u) + ret += [e for e in user_emails if e not in ret] return ret def _send_email(self, alert, action):