From 02714dccf7350c11073222b398df9c8147b9486b Mon Sep 17 00:00:00 2001 From: Florian Dupret <34862846+sephrat@users.noreply.github.com> Date: Tue, 11 Jan 2022 15:37:15 +0100 Subject: [PATCH] Send new request to power users as convention Remove option to toggle it off --- src/Ombi.Notifications/Agents/EmailNotification.cs | 5 +---- .../Models/Notifications/EmailNotificationSettings.cs | 1 - .../ClientApp/src/app/interfaces/INotificationSettings.ts | 1 - .../settings/notifications/emailnotification.component.html | 4 ---- .../settings/notifications/emailnotification.component.ts | 1 - 5 files changed, 1 insertion(+), 11 deletions(-) diff --git a/src/Ombi.Notifications/Agents/EmailNotification.cs b/src/Ombi.Notifications/Agents/EmailNotification.cs index 71728ac15..6bd1ec9b9 100644 --- a/src/Ombi.Notifications/Agents/EmailNotification.cs +++ b/src/Ombi.Notifications/Agents/EmailNotification.cs @@ -116,10 +116,7 @@ namespace Ombi.Notifications.Agents message.Other.Add("PlainTextBody", plaintext); IEnumerable recipients = await _userManager.GetUsersInRoleAsync(OmbiRoles.Admin); - if (settings.SendNewRequestToPowerUsers) - { - recipients = recipients.Concat(await _userManager.GetUsersInRoleAsync(OmbiRoles.PowerUser)); - } + recipients = recipients.Concat(await _userManager.GetUsersInRoleAsync(OmbiRoles.PowerUser)); foreach (var recipient in recipients.DistinctBy(x => x.Email)) { if (recipient.Email.IsNullOrEmpty()) diff --git a/src/Ombi.Settings/Settings/Models/Notifications/EmailNotificationSettings.cs b/src/Ombi.Settings/Settings/Models/Notifications/EmailNotificationSettings.cs index c0a884439..9ea8cc492 100644 --- a/src/Ombi.Settings/Settings/Models/Notifications/EmailNotificationSettings.cs +++ b/src/Ombi.Settings/Settings/Models/Notifications/EmailNotificationSettings.cs @@ -13,6 +13,5 @@ public string AdminEmail { get; set; } public bool DisableTLS { get; set; } public bool DisableCertificateChecking { get; set; } - public bool SendNewRequestToPowerUsers{ get; set; } } } \ No newline at end of file diff --git a/src/Ombi/ClientApp/src/app/interfaces/INotificationSettings.ts b/src/Ombi/ClientApp/src/app/interfaces/INotificationSettings.ts index f244690aa..f2efc3f6f 100644 --- a/src/Ombi/ClientApp/src/app/interfaces/INotificationSettings.ts +++ b/src/Ombi/ClientApp/src/app/interfaces/INotificationSettings.ts @@ -15,7 +15,6 @@ export interface IEmailNotificationSettings extends INotificationSettings { adminEmail: string; disableTLS: boolean; disableCertificateChecking: boolean; - sendNewRequestToPowerUsers: boolean; notificationTemplates: INotificationTemplates[]; } diff --git a/src/Ombi/ClientApp/src/app/settings/notifications/emailnotification.component.html b/src/Ombi/ClientApp/src/app/settings/notifications/emailnotification.component.html index 2cc4344f0..5c24d21f2 100644 --- a/src/Ombi/ClientApp/src/app/settings/notifications/emailnotification.component.html +++ b/src/Ombi/ClientApp/src/app/settings/notifications/emailnotification.component.html @@ -21,10 +21,6 @@ Disable Certificate Checking -
- Send New Request - To Power Users -
diff --git a/src/Ombi/ClientApp/src/app/settings/notifications/emailnotification.component.ts b/src/Ombi/ClientApp/src/app/settings/notifications/emailnotification.component.ts index 5d799609a..f880891a5 100644 --- a/src/Ombi/ClientApp/src/app/settings/notifications/emailnotification.component.ts +++ b/src/Ombi/ClientApp/src/app/settings/notifications/emailnotification.component.ts @@ -38,7 +38,6 @@ export class EmailNotificationComponent implements OnInit { adminEmail: [x.adminEmail, [Validators.required, Validators.email]], disableTLS: [x.disableTLS], disableCertificateChecking: [x.disableCertificateChecking], - sendNewRequestToPowerUsers: [x.sendNewRequestToPowerUsers], }); if (x.authentication) {