github/Ombi
1
0
Fork 0
mirror of https://github.com/Ombi-app/Ombi.git synced 2025-07-16 02:02:55 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed #2725 and #2721

Browse source
This commit is contained in:
TidusJar 2019-01-08 12:56:32 +00:00
parent cdab76da40
commit b305413351
2 changed files with 3 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/Ombi.Notifications/NotificationMessageCurlys.cs
View file

@ -39,7 +39,7 @@ namespace Ombi.Notifications
Alias = (req?.RequestedUser?.Alias.HasValue() ?? false) ? req?.RequestedUser?.Alias : req?.RequestedUser?.UserName; Alias = (req?.RequestedUser?.Alias.HasValue() ?? false) ? req?.RequestedUser?.Alias : req?.RequestedUser?.UserName;
if (pref != null) if (pref != null)
{ {
UserPreference = pref.Enabled ? pref.Value : Alias; UserPreference = pref.Value.HasValue() ? pref.Value : Alias;
} }
Title = title; Title = title;
RequestedDate = req?.RequestedDate.ToString("D"); RequestedDate = req?.RequestedDate.ToString("D");
@ -91,7 +91,7 @@ namespace Ombi.Notifications
Alias = (req?.RequestedUser?.Alias.HasValue() ?? false) ? req?.RequestedUser?.Alias : req?.RequestedUser?.UserName; Alias = (req?.RequestedUser?.Alias.HasValue() ?? false) ? req?.RequestedUser?.Alias : req?.RequestedUser?.UserName;
if (pref != null) if (pref != null)
{ {
UserPreference = pref.Enabled ? pref.Value : Alias; UserPreference = pref.Value.HasValue() ? pref.Value : Alias;
} }
Title = title; Title = title;
RequestedDate = req?.RequestedDate.ToString("D"); RequestedDate = req?.RequestedDate.ToString("D");
@ -136,7 +136,7 @@ namespace Ombi.Notifications
Alias = (req?.RequestedUser?.Alias.HasValue() ?? false) ? req?.RequestedUser?.Alias : req?.RequestedUser?.UserName; Alias = (req?.RequestedUser?.Alias.HasValue() ?? false) ? req?.RequestedUser?.Alias : req?.RequestedUser?.UserName;
if (pref != null) if (pref != null)
{ {
UserPreference = pref.Enabled ? pref.Value : Alias; UserPreference = pref.Value.HasValue() ? pref.Value : Alias;
} }
Title = title; Title = title;
RequestedDate = req?.RequestedDate.ToString("D"); RequestedDate = req?.RequestedDate.ToString("D");

2
src/Ombi/Controllers/IdentityController.cs
View file

@ -965,7 +965,6 @@ namespace Ombi.Controllers
{ {
// Update it // Update it
existingPreference.Value = pref.Value; existingPreference.Value = pref.Value;
existingPreference.Enabled = pref.Enabled;
await _userNotificationPreferences.SaveChangesAsync(); await _userNotificationPreferences.SaveChangesAsync();
} }
else else
@ -973,7 +972,6 @@ namespace Ombi.Controllers
await _userNotificationPreferences.Add(new UserNotificationPreferences await _userNotificationPreferences.Add(new UserNotificationPreferences
{ {
Agent = pref.Agent, Agent = pref.Agent,
Enabled = pref.Enabled,
UserId = pref.UserId, UserId = pref.UserId,
Value = pref.Value Value = pref.Value
}); });