alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-06-10 01:38:49 +01:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

move user image into profile settings

Browse Source
This commit is contained in:
Luke Pulverenti
2014-10-15 23:26:39 -04:00
parent b889c31f56
commit 6ca771cc79
81 changed files with 886 additions and 219 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
MediaBrowser.Api/UserService.cs
View File

@@ -5,6 +5,7 @@ using MediaBrowser.Controller.Dto;
using MediaBrowser.Controller.Library;
using MediaBrowser.Controller.Net;
using MediaBrowser.Controller.Session;
using MediaBrowser.Model.Connect;
using MediaBrowser.Model.Dto;
using MediaBrowser.Model.Users;
using ServiceStack;
@@ -190,11 +191,8 @@ namespace MediaBrowser.Api
public object Get(GetPublicUsers request)
{
var authInfo = AuthorizationContext.GetAuthorizationInfo(Request);
var isDashboard = string.Equals(authInfo.Client, "Dashboard", StringComparison.OrdinalIgnoreCase);
if ((Request.IsLocal && isDashboard) ||
!_config.Configuration.IsStartupWizardCompleted)
// If the startup wizard hasn't been completed then just return all users
if (!_config.Configuration.IsStartupWizardCompleted)
{
return Get(new GetUsers
{
@@ -202,6 +200,18 @@ namespace MediaBrowser.Api
});
}
var authInfo = AuthorizationContext.GetAuthorizationInfo(Request);
var isDashboard = string.Equals(authInfo.Client, "Dashboard", StringComparison.OrdinalIgnoreCase);
if (Request.IsLocal && isDashboard)
{
var users = _userManager.Users
.Where(i => !i.Configuration.IsDisabled && !(i.ConnectLinkType.HasValue && i.ConnectLinkType.Value == UserLinkType.Guest))
.ToList();
return ToOptimizedResult(users);
}
// TODO: Uncomment this once all clients can handle an empty user list.
return Get(new GetUsers
{