aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Api/UserService.cs
diff options
context:
space:
mode:
authorTechywarrior <techywarrior@gmail.com>2013-04-02 13:07:55 -0700
committerTechywarrior <techywarrior@gmail.com>2013-04-02 13:07:55 -0700
commit713afcf6755b15142244cad6b16f8d539bd12893 (patch)
treed5d7479281f85fc47d24d8c95a2ce29a3a146d8b /MediaBrowser.Api/UserService.cs
parentc957f202cc1fefb174377b99495b329a6cb9ee72 (diff)
parente2562879d86aafc1063e37bfd353c22309e8e237 (diff)
Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser
Diffstat (limited to 'MediaBrowser.Api/UserService.cs')
-rw-r--r--MediaBrowser.Api/UserService.cs8
1 files changed, 5 insertions, 3 deletions
diff --git a/MediaBrowser.Api/UserService.cs b/MediaBrowser.Api/UserService.cs
index b495d07f9..f2a9ca24b 100644
--- a/MediaBrowser.Api/UserService.cs
+++ b/MediaBrowser.Api/UserService.cs
@@ -142,6 +142,8 @@ namespace MediaBrowser.Api
/// Initializes a new instance of the <see cref="UserService" /> class.
/// </summary>
/// <param name="xmlSerializer">The XML serializer.</param>
+ /// <param name="userManager">The user manager.</param>
+ /// <param name="libraryManager">The library manager.</param>
/// <exception cref="System.ArgumentNullException">xmlSerializer</exception>
public UserService(IXmlSerializer xmlSerializer, IUserManager userManager, ILibraryManager libraryManager)
: base()
@@ -163,7 +165,7 @@ namespace MediaBrowser.Api
/// <returns>System.Object.</returns>
public object Get(GetUsers request)
{
- var dtoBuilder = new DtoBuilder(Logger, _libraryManager);
+ var dtoBuilder = new DtoBuilder(Logger, _libraryManager, _userManager);
var tasks = _userManager.Users.OrderBy(u => u.Name).Select(dtoBuilder.GetUserDto).ToArray();
@@ -186,7 +188,7 @@ namespace MediaBrowser.Api
throw new ResourceNotFoundException("User not found");
}
- var result = new DtoBuilder(Logger, _libraryManager).GetUserDto(user).Result;
+ var result = new DtoBuilder(Logger, _libraryManager, _userManager).GetUserDto(user).Result;
return ToOptimizedResult(result);
}
@@ -300,7 +302,7 @@ namespace MediaBrowser.Api
newUser.UpdateConfiguration(dtoUser.Configuration, _xmlSerializer);
- var result = new DtoBuilder(Logger, _libraryManager).GetUserDto(newUser).Result;
+ var result = new DtoBuilder(Logger, _libraryManager, _userManager).GetUserDto(newUser).Result;
return ToOptimizedResult(result);
}