diff --git a/src/Umbraco.Core/Persistence/Repositories/AuditRepository.cs b/src/Umbraco.Core/Persistence/Repositories/AuditRepository.cs index 6881c77831..92eca1b832 100644 --- a/src/Umbraco.Core/Persistence/Repositories/AuditRepository.cs +++ b/src/Umbraco.Core/Persistence/Repositories/AuditRepository.cs @@ -95,8 +95,16 @@ namespace Umbraco.Core.Persistence.Repositories var pagedResult = Database.Page(pageIndex + 1, pageSize, translatedQuery); totalRecords = pagedResult.TotalItems; - return pagedResult.Items.Select( + var pages = pagedResult.Items.Select( dto => new AuditItem(dto.Id, dto.Comment, Enum.Parse(dto.Header), dto.UserId)).ToArray(); + + //Mapping the DateStamp + for (int i = 0; i < pages.Length; i++) + { + pages[i].CreateDate = pagedResult.Items[i].Datestamp; + } + + return pages; } protected override void PersistUpdatedItem(IAuditItem entity) diff --git a/src/Umbraco.Core/Services/ContentService.cs b/src/Umbraco.Core/Services/ContentService.cs index d9edb14341..b5abec435c 100644 --- a/src/Umbraco.Core/Services/ContentService.cs +++ b/src/Umbraco.Core/Services/ContentService.cs @@ -2452,9 +2452,7 @@ namespace Umbraco.Core.Services _publishingStrategy.PublishingFinalized(uow, descendants, false); } - - var user = ApplicationContext.Current.Services.UserService.GetProfileById(userId); - Audit(uow, AuditType.Publish, "Save and Publish performed by user " + user.Name, userId, content.Id); + Audit(uow, AuditType.Publish, "Save and Publish performed by user", userId, content.Id); uow.Commit(); return Attempt.If(publishStatus.StatusType == PublishStatusType.Success, publishStatus); } diff --git a/src/Umbraco.Web/Editors/LogController.cs b/src/Umbraco.Web/Editors/LogController.cs index 5638af740f..5122a458f6 100644 --- a/src/Umbraco.Web/Editors/LogController.cs +++ b/src/Umbraco.Web/Editors/LogController.cs @@ -34,10 +34,12 @@ namespace Umbraco.Web.Editors var result = Services.AuditService.GetPagedItemsByEntity(id, pageNumber - 1, pageSize, out totalRecords, orderDirection, customFilter: dateQuery); var mapped = Mapper.Map>(result); - return new PagedResult(totalRecords, pageNumber, pageSize) + var page = new PagedResult(totalRecords, pageNumber, pageSize) { - Items = MapAvatars(mapped) + Items = MapAvatarsAndNames(mapped) }; + + return page; } public PagedResult GetPagedCurrentUserLog( @@ -52,7 +54,7 @@ namespace Umbraco.Web.Editors var mapped = Mapper.Map>(result); return new PagedResult(totalRecords, pageNumber + 1, pageSize) { - Items = MapAvatars(mapped) + Items = MapAvatarsAndNames(mapped) }; } @@ -84,14 +86,16 @@ namespace Umbraco.Web.Editors Log.Instance.GetLogItems(Enum.Parse(logType.ToString()), sinceDate.Value)); } - private IEnumerable MapAvatars(IEnumerable items) + private IEnumerable MapAvatarsAndNames(IEnumerable items) { var userIds = items.Select(x => x.UserId).ToArray(); var users = Services.UserService.GetUsersById(userIds) .ToDictionary(x => x.Id, x => x.GetUserAvatarUrls(ApplicationContext.ApplicationCache.RuntimeCache)); + var userNames = Services.UserService.GetUsersById(userIds).ToDictionary(x => x.Id, x => x.Name); foreach (var item in items) { item.UserAvatars = users[item.UserId]; + item.UserName = userNames[item.UserId]; } return items; }