Backupppert/jellyfin
0
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2024-07-25 15:08:37 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3557 from crobibero/fix-update-user

Browse source 
Fix update user
This commit is contained in:
Anthony Lavado 2020-07-14 11:23:35 -04:00 committed by GitHub
parent eddce72c52 e143387cbd
commit 175e7b45e5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
Jellyfin.Server.Implementations/Users/UserManager.cs
View file

@ -92,7 +92,8 @@ namespace Jellyfin.Server.Implementations.Users
get get
{ {
using var dbContext = _dbProvider.CreateContext(); using var dbContext = _dbProvider.CreateContext();
return dbContext.Users.Include(user => user.Permissions) return dbContext.Users
.Include(user => user.Permissions)
.Include(user => user.Preferences) .Include(user => user.Preferences)
.Include(user => user.AccessSchedules) .Include(user => user.AccessSchedules)
.Include(user => user.ProfileImage) .Include(user => user.ProfileImage)
@ -112,7 +113,8 @@ namespace Jellyfin.Server.Implementations.Users
} }
using var dbContext = _dbProvider.CreateContext(); using var dbContext = _dbProvider.CreateContext();
return dbContext.Users.Include(user => user.Permissions) return dbContext.Users
.Include(user => user.Permissions)
.Include(user => user.Preferences) .Include(user => user.Preferences)
.Include(user => user.AccessSchedules) .Include(user => user.AccessSchedules)
.Include(user => user.ProfileImage) .Include(user => user.ProfileImage)
@ -128,8 +130,8 @@ namespace Jellyfin.Server.Implementations.Users
} }
using var dbContext = _dbProvider.CreateContext(); using var dbContext = _dbProvider.CreateContext();
return dbContext.Users
return dbContext.Users.Include(user => user.Permissions) .Include(user => user.Permissions)
.Include(user => user.Preferences) .Include(user => user.Preferences)
.Include(user => user.AccessSchedules) .Include(user => user.AccessSchedules)
.Include(user => user.ProfileImage) .Include(user => user.ProfileImage)
@ -218,7 +220,8 @@ namespace Jellyfin.Server.Implementations.Users
public void DeleteUser(Guid userId) public void DeleteUser(Guid userId)
{ {
using var dbContext = _dbProvider.CreateContext(); using var dbContext = _dbProvider.CreateContext();
var user = dbContext.Users.Include(u => u.Permissions) var user = dbContext.Users
.Include(u => u.Permissions)
.Include(u => u.Preferences) .Include(u => u.Preferences)
.Include(u => u.AccessSchedules) .Include(u => u.AccessSchedules)
.Include(u => u.ProfileImage) .Include(u => u.ProfileImage)
@ -635,7 +638,14 @@ namespace Jellyfin.Server.Implementations.Users
public void UpdateConfiguration(Guid userId, UserConfiguration config) public void UpdateConfiguration(Guid userId, UserConfiguration config)
{ {
var dbContext = _dbProvider.CreateContext(); var dbContext = _dbProvider.CreateContext();
var user = dbContext.Users.Find(userId) ?? throw new ArgumentException("No user exists with given Id!"); var user = dbContext.Users
.Include(u => u.Permissions)
.Include(u => u.Preferences)
.Include(u => u.AccessSchedules)
.Include(u => u.ProfileImage)
.FirstOrDefault(u => u.Id == userId)
?? throw new ArgumentException("No user exists with given Id!");
user.SubtitleMode = config.SubtitleMode; user.SubtitleMode = config.SubtitleMode;
user.HidePlayedInLatest = config.HidePlayedInLatest; user.HidePlayedInLatest = config.HidePlayedInLatest;
user.EnableLocalPassword = config.EnableLocalPassword; user.EnableLocalPassword = config.EnableLocalPassword;