github/Ombi
1
0
Fork 0
mirror of https://github.com/Ombi-app/Ombi.git synced 2025-08-21 05:43:19 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed #1252 (Show the correct user type on the management page for Plex Users)

Browse source 
Fixed #1261 (User login time not being populated)
This commit is contained in:
Jamie.Rees 2017-03-29 08:49:00 +01:00
commit 4e817b5aaa
5 changed files with 30 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Ombi.Core/Users/UserHelper.cs
View file

@ -63,7 +63,9 @@ namespace Ombi.Core.Users
Username = localUsers.UserName,
UserAlias = props.UserAlias,
EmailAddress = props.EmailAddress,
Permissions = (Permissions) localUsers.Permissions
Permissions = (Permissions) localUsers.Permissions,
UserId = localUsers.UserGuid,
Features = (Features)localUsers.Features
};
}
@ -76,7 +78,10 @@ namespace Ombi.Core.Users
Username = plexUsers.Username,
UserAlias = plexUsers.UserAlias,
EmailAddress = plexUsers.EmailAddress,
Permissions = (Permissions)plexUsers.Permissions
Permissions = (Permissions)plexUsers.Permissions,
UserId = plexUsers.PlexUserId,
Features = (Features)plexUsers.Features
};
}
@ -89,7 +94,9 @@ namespace Ombi.Core.Users
Username = embyUsers.Username,
UserAlias = embyUsers.UserAlias,
EmailAddress = embyUsers.EmailAddress,
Permissions = (Permissions)embyUsers.Permissions
Permissions = (Permissions)embyUsers.Permissions,
UserId = embyUsers.EmbyUserId,
Features = (Features)embyUsers.Features
};
}
return null;

1
Ombi.Core/Users/UserHelperModel.cs
View file

@ -39,6 +39,7 @@ namespace Ombi.Core.Users
public Features Features { get; set; }
public string EmailAddress { get; set; }
public UserType Type { get; set; }
public string UserId { get; set; }
[JsonIgnore]
public string UsernameOrAlias => string.IsNullOrEmpty(UserAlias) ? Username : UserAlias;