diff --git a/MediaBrowser.Api/Reports/Activities/ReportActivitiesBuilder.cs b/MediaBrowser.Api/Reports/Activities/ReportActivitiesBuilder.cs
index 4e2e858465..34115812e0 100644
--- a/MediaBrowser.Api/Reports/Activities/ReportActivitiesBuilder.cs
+++ b/MediaBrowser.Api/Reports/Activities/ReportActivitiesBuilder.cs
@@ -159,7 +159,17 @@ namespace MediaBrowser.Api.Reports
break;
case HeaderMetadata.UserPrimaryImageTag:
- option.Column = (i, r) => i.UserPrimaryImageTag;
+ //option.Column = (i, r) => i.UserPrimaryImageTag;
+ option.Column = (i, r) =>
+ {
+ if (!string.IsNullOrEmpty(i.UserId))
+ {
+ MediaBrowser.Controller.Entities.User user = _userManager.GetUserById(i.UserId);
+ if (user != null)
+ return user.PrimaryImagePath;
+ }
+ return string.Empty;
+ };
option.Header.SortField = "";
break;
case HeaderMetadata.Severity:
diff --git a/MediaBrowser.Api/Reports/ReportsService.cs b/MediaBrowser.Api/Reports/ReportsService.cs
index ebf5183c51..2c07287199 100644
--- a/MediaBrowser.Api/Reports/ReportsService.cs
+++ b/MediaBrowser.Api/Reports/ReportsService.cs
@@ -24,1139 +24,1219 @@ using System.Text;
namespace MediaBrowser.Api.Reports
{
- /// The reports service.
- ///
- public class ReportsService : BaseApiService
- {
+ /// The reports service.
+ ///
+ public class ReportsService : BaseApiService
+ {
+ #region [Constructors]
+ ///
+ /// Initializes a new instance of the MediaBrowser.Api.Reports.ReportsService class.
+ /// Manager for user.
+ /// Manager for library.
+ /// The localization.
+ /// Manager for activity.
+ public ReportsService(IUserManager userManager, ILibraryManager libraryManager, ILocalizationManager localization, IActivityManager activityManager, IActivityRepository repo)
+ {
+ _userManager = userManager;
+ _libraryManager = libraryManager;
+ _localization = localization;
+ _activityManager = activityManager;
+ _repo = repo;
+ }
- /// Manager for user.
- private readonly IUserManager _userManager;
+ #endregion
- /// Manager for library.
- private readonly ILibraryManager _libraryManager;
- /// The localization.
- private readonly ILocalizationManager _localization;
+ #region [Private Fields]
- ///
- /// Initializes a new instance of the MediaBrowser.Api.Reports.ReportsService class.
- /// Manager for user.
- /// Manager for library.
- /// The localization.
- public ReportsService(IUserManager userManager, ILibraryManager libraryManager, ILocalizationManager localization)
- {
- _userManager = userManager;
- _libraryManager = libraryManager;
- _localization = localization;
- }
+ private readonly IActivityManager _activityManager; ///< Manager for activity
- /// Gets the given request.
- /// The request.
- /// A Task<object>
- public async Task