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

more small tweaks around the username/alias

Browse source
This commit is contained in:
Jamie.Rees 2017-01-25 12:03:55 +00:00
commit 3d2209d163
6 changed files with 23 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Ombi.Core/SecurityExtensions.cs
View file

@ -114,9 +114,13 @@ namespace Ombi.Core
}
// could be a local user
var localName = session[SessionKeys.UsernameKey];
var hasSessionKey = session[SessionKeys.UsernameKey] != null;
if (hasSessionKey)
{
return (string)session[SessionKeys.UsernameKey];
}
return localName as string;
return string.Empty;
}

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

@ -25,6 +25,7 @@
// ************************************************************************/
#endregion
using Newtonsoft.Json;
using Ombi.Helpers;
using Ombi.Helpers.Permissions;
@ -38,5 +39,8 @@ namespace Ombi.Core.Users
public Features Features { get; set; }
public string EmailAddress { get; set; }
public UserType Type { get; set; }
[JsonIgnore]
public string UsernameOrAlias => string.IsNullOrEmpty(UserAlias) ? Username : UserAlias;
}
}