diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2014-09-14 11:10:51 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2014-09-14 11:10:51 -0400 |
| commit | 5c615fa02448813499ed87f2a1c2b937c7a7dcd5 (patch) | |
| tree | b96b07cb1d43006a8faa64649885fb808e18c43a /MediaBrowser.Server.Implementations/Library | |
| parent | 4f3ea6c6c3cdde7f4b8d21dc97c711635d73b4e0 (diff) | |
add connect linking
Diffstat (limited to 'MediaBrowser.Server.Implementations/Library')
3 files changed, 17 insertions, 3 deletions
diff --git a/MediaBrowser.Server.Implementations/Library/SearchEngine.cs b/MediaBrowser.Server.Implementations/Library/SearchEngine.cs index 6faa72b81..738222540 100644 --- a/MediaBrowser.Server.Implementations/Library/SearchEngine.cs +++ b/MediaBrowser.Server.Implementations/Library/SearchEngine.cs @@ -39,7 +39,7 @@ namespace MediaBrowser.Server.Implementations.Library } else { - var user = _userManager.GetUserById(new Guid(query.UserId)); + var user = _userManager.GetUserById(query.UserId); inputItems = user.RootFolder.GetRecursiveChildren(user, true); } diff --git a/MediaBrowser.Server.Implementations/Library/UserManager.cs b/MediaBrowser.Server.Implementations/Library/UserManager.cs index 94cc61240..47d6b17f0 100644 --- a/MediaBrowser.Server.Implementations/Library/UserManager.cs +++ b/MediaBrowser.Server.Implementations/Library/UserManager.cs @@ -128,6 +128,16 @@ namespace MediaBrowser.Server.Implementations.Library return Users.FirstOrDefault(u => u.Id == id); } + /// <summary> + /// Gets the user by identifier. + /// </summary> + /// <param name="id">The identifier.</param> + /// <returns>User.</returns> + public User GetUserById(string id) + { + return GetUserById(new Guid(id)); + } + public async Task Initialize() { Users = await LoadUsers().ConfigureAwait(false); @@ -219,6 +229,9 @@ namespace MediaBrowser.Server.Implementations.Library await UserRepository.SaveUser(user, CancellationToken.None).ConfigureAwait(false); users.Add(user); + + user.Configuration.IsAdministrator = true; + UpdateConfiguration(user, user.Configuration); } return users; @@ -503,7 +516,8 @@ namespace MediaBrowser.Server.Implementations.Library Name = name, Id = ("MBUser" + name).GetMD5(), DateCreated = DateTime.UtcNow, - DateModified = DateTime.UtcNow + DateModified = DateTime.UtcNow, + UsesIdForConfigurationPath = true }; } diff --git a/MediaBrowser.Server.Implementations/Library/UserViewManager.cs b/MediaBrowser.Server.Implementations/Library/UserViewManager.cs index 61283505b..4beb34e4f 100644 --- a/MediaBrowser.Server.Implementations/Library/UserViewManager.cs +++ b/MediaBrowser.Server.Implementations/Library/UserViewManager.cs @@ -47,7 +47,7 @@ namespace MediaBrowser.Server.Implementations.Library public async Task<IEnumerable<Folder>> GetUserViews(UserViewQuery query, CancellationToken cancellationToken) { - var user = _userManager.GetUserById(new Guid(query.UserId)); + var user = _userManager.GetUserById(query.UserId); var folders = user.RootFolder .GetChildren(user, true) |
