From 5f6c4cdf9293041b512d3a2deafb3208d5d61b0c Mon Sep 17 00:00:00 2001 From: sitereactor Date: Mon, 5 Nov 2012 14:43:51 -0100 Subject: [PATCH] Renaming User to Creator on Content - makes more sense. --- src/Umbraco.Core/Models/ContentBase.cs | 10 +++++----- src/Umbraco.Core/Models/IContentBase.cs | 2 +- .../Persistence/Factories/ContentFactory.cs | 4 ++-- src/Umbraco.Core/Persistence/Factories/MediaFactory.cs | 4 ++-- src/Umbraco.Core/Persistence/Mappers/ContentMapper.cs | 2 +- src/Umbraco.Core/Persistence/Mappers/MediaMapper.cs | 2 +- .../Persistence/Repositories/ContentRepositoryTest.cs | 2 +- .../TestHelpers/Entities/MockedContent.cs | 6 +++--- src/Umbraco.Web/Services/ContentService.cs | 6 +++--- 9 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/Umbraco.Core/Models/ContentBase.cs b/src/Umbraco.Core/Models/ContentBase.cs index 6caa29d8a1..bf0c8dc9be 100644 --- a/src/Umbraco.Core/Models/ContentBase.cs +++ b/src/Umbraco.Core/Models/ContentBase.cs @@ -21,7 +21,7 @@ namespace Umbraco.Core.Models private int _sortOrder; private int _level; private string _path; - private IProfile _user; + private IProfile _creator; private bool _trashed; private int _contentTypeId; private PropertyCollection _properties; @@ -45,7 +45,7 @@ namespace Umbraco.Core.Models private static readonly PropertyInfo SortOrderSelector = ExpressionHelper.GetPropertyInfo(x => x.SortOrder); private static readonly PropertyInfo LevelSelector = ExpressionHelper.GetPropertyInfo(x => x.Level); private static readonly PropertyInfo PathSelector = ExpressionHelper.GetPropertyInfo(x => x.Path); - private static readonly PropertyInfo UserSelector = ExpressionHelper.GetPropertyInfo(x => x.User); + private static readonly PropertyInfo UserSelector = ExpressionHelper.GetPropertyInfo(x => x.Creator); private static readonly PropertyInfo TrashedSelector = ExpressionHelper.GetPropertyInfo(x => x.Trashed); private static readonly PropertyInfo DefaultContentTypeIdSelector = ExpressionHelper.GetPropertyInfo(x => x.ContentTypeId); private readonly static PropertyInfo PropertyCollectionSelector = ExpressionHelper.GetPropertyInfo(x => x.Properties); @@ -140,12 +140,12 @@ namespace Umbraco.Core.Models /// IProfile of the user who created this Content /// [DataMember] - public virtual IProfile User + public virtual IProfile Creator { - get { return _user; } + get { return _creator; } set { - _user = value; + _creator = value; OnPropertyChanged(UserSelector); } } diff --git a/src/Umbraco.Core/Models/IContentBase.cs b/src/Umbraco.Core/Models/IContentBase.cs index 5af5684726..adcd9f9d9b 100644 --- a/src/Umbraco.Core/Models/IContentBase.cs +++ b/src/Umbraco.Core/Models/IContentBase.cs @@ -44,7 +44,7 @@ namespace Umbraco.Core.Models /// /// Profile of the user who created the Content /// - IProfile User { get; set; } + IProfile Creator { get; set; } /// /// Boolean indicating whether this Content is Trashed or not. diff --git a/src/Umbraco.Core/Persistence/Factories/ContentFactory.cs b/src/Umbraco.Core/Persistence/Factories/ContentFactory.cs index 88bf204034..18ebe6e2a1 100644 --- a/src/Umbraco.Core/Persistence/Factories/ContentFactory.cs +++ b/src/Umbraco.Core/Persistence/Factories/ContentFactory.cs @@ -43,7 +43,7 @@ namespace Umbraco.Core.Persistence.Factories : _id.ToGuid(), Name = dto.ContentVersionDto.ContentDto.NodeDto.Text, Path = dto.ContentVersionDto.ContentDto.NodeDto.Path, - User = _user, + Creator = _user, Writer = _writer, Level = dto.ContentVersionDto.ContentDto.NodeDto.Level, ParentId = dto.ContentVersionDto.ContentDto.NodeDto.ParentId, @@ -127,7 +127,7 @@ namespace Umbraco.Core.Persistence.Factories Text = entity.Name, Trashed = entity.Trashed, UniqueId = entity.Key, - UserId = entity.User.Id.SafeCast() + UserId = entity.Creator.Id.SafeCast() }; return nodeDto; diff --git a/src/Umbraco.Core/Persistence/Factories/MediaFactory.cs b/src/Umbraco.Core/Persistence/Factories/MediaFactory.cs index 56ee508f0b..8ae70dfba6 100644 --- a/src/Umbraco.Core/Persistence/Factories/MediaFactory.cs +++ b/src/Umbraco.Core/Persistence/Factories/MediaFactory.cs @@ -41,7 +41,7 @@ namespace Umbraco.Core.Persistence.Factories : _id.ToGuid(), Name = dto.ContentDto.NodeDto.Text, Path = dto.ContentDto.NodeDto.Path, - User = _user, + Creator = _user, Level = dto.ContentDto.NodeDto.Level, ParentId = dto.ContentDto.NodeDto.ParentId, SortOrder = dto.ContentDto.NodeDto.SortOrder, @@ -102,7 +102,7 @@ namespace Umbraco.Core.Persistence.Factories Text = entity.Name, Trashed = entity.Trashed, UniqueId = entity.Key, - UserId = entity.User.Id.SafeCast() + UserId = entity.Creator.Id.SafeCast() }; return nodeDto; diff --git a/src/Umbraco.Core/Persistence/Mappers/ContentMapper.cs b/src/Umbraco.Core/Persistence/Mappers/ContentMapper.cs index 9dc82bac01..e334976c36 100644 --- a/src/Umbraco.Core/Persistence/Mappers/ContentMapper.cs +++ b/src/Umbraco.Core/Persistence/Mappers/ContentMapper.cs @@ -36,7 +36,7 @@ namespace Umbraco.Core.Persistence.Mappers CacheMap(src => src.Name, dto => dto.Text); CacheMap(src => src.Trashed, dto => dto.Trashed); CacheMap(src => src.Key, dto => dto.UniqueId); - CacheMap(src => src.User, dto => dto.UserId); + CacheMap(src => src.Creator, dto => dto.UserId); CacheMap(src => src.ContentTypeId, dto => dto.ContentTypeId); CacheMap(src => src.UpdateDate, dto => dto.VersionDate); CacheMap(src => src.Version, dto => dto.VersionId); diff --git a/src/Umbraco.Core/Persistence/Mappers/MediaMapper.cs b/src/Umbraco.Core/Persistence/Mappers/MediaMapper.cs index cd54d8be4f..650869d8c3 100644 --- a/src/Umbraco.Core/Persistence/Mappers/MediaMapper.cs +++ b/src/Umbraco.Core/Persistence/Mappers/MediaMapper.cs @@ -35,7 +35,7 @@ namespace Umbraco.Core.Persistence.Mappers CacheMap(src => src.Name, dto => dto.Text); CacheMap(src => src.Trashed, dto => dto.Trashed); CacheMap(src => src.Key, dto => dto.UniqueId); - CacheMap(src => src.User, dto => dto.UserId); + CacheMap(src => src.Creator, dto => dto.UserId); CacheMap(src => src.ContentTypeId, dto => dto.ContentTypeId); CacheMap(src => src.UpdateDate, dto => dto.VersionDate); CacheMap(src => src.Version, dto => dto.VersionId); diff --git a/src/Umbraco.Tests/Persistence/Repositories/ContentRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/ContentRepositoryTest.cs index 4d21a45e52..9e68a575ee 100644 --- a/src/Umbraco.Tests/Persistence/Repositories/ContentRepositoryTest.cs +++ b/src/Umbraco.Tests/Persistence/Repositories/ContentRepositoryTest.cs @@ -174,7 +174,7 @@ namespace Umbraco.Tests.Persistence.Repositories var contentType = contentTypeRepository.Get(1045); var content = new Content(1048, contentType); content.Name = "Textpage 2 Child Node"; - content.User = new Profile(0, "Administrator"); + content.Creator = new Profile(0, "Administrator"); // Act repository.AddOrUpdate(content); diff --git a/src/Umbraco.Tests/TestHelpers/Entities/MockedContent.cs b/src/Umbraco.Tests/TestHelpers/Entities/MockedContent.cs index 61f9ae4eb6..a331c6818b 100644 --- a/src/Umbraco.Tests/TestHelpers/Entities/MockedContent.cs +++ b/src/Umbraco.Tests/TestHelpers/Entities/MockedContent.cs @@ -7,7 +7,7 @@ namespace Umbraco.Tests.TestHelpers.Entities { public static Content CreateSimpleContent(IContentType contentType) { - var content = new Content(-1, contentType) { Name = "Home", Language = "en-US", Level = 1, ParentId = -1, SortOrder = 1, Template = "~/masterpages/umbTextPage.master", User = new Profile(0, "Administrator"), Writer = new Profile(0, "Administrator") }; + var content = new Content(-1, contentType) { Name = "Home", Language = "en-US", Level = 1, ParentId = -1, SortOrder = 1, Template = "~/masterpages/umbTextPage.master", Creator = new Profile(0, "Administrator"), Writer = new Profile(0, "Administrator") }; object obj = new { @@ -23,7 +23,7 @@ namespace Umbraco.Tests.TestHelpers.Entities public static Content CreateSimpleContent(IContentType contentType, string name, int parentId) { - var content = new Content(parentId, contentType) { Name = name, Language = "en-US", ParentId = parentId, Template = "~/masterpages/umbTextPage.master", User = new Profile(0, "Administrator"), Writer = new Profile(0, "Administrator") }; + var content = new Content(parentId, contentType) { Name = name, Language = "en-US", ParentId = parentId, Template = "~/masterpages/umbTextPage.master", Creator = new Profile(0, "Administrator"), Writer = new Profile(0, "Administrator") }; object obj = new { @@ -39,7 +39,7 @@ namespace Umbraco.Tests.TestHelpers.Entities public static Content CreateTextpageContent(IContentType contentType, string name, int parentId) { - var content = new Content(parentId, contentType) { Name = name, Language = "en-US", ParentId = parentId, Template = "~/masterpages/umbTextPage.master", User = new Profile(0, "Administrator"), Writer = new Profile(0, "Administrator")}; + var content = new Content(parentId, contentType) { Name = name, Language = "en-US", ParentId = parentId, Template = "~/masterpages/umbTextPage.master", Creator = new Profile(0, "Administrator"), Writer = new Profile(0, "Administrator")}; object obj = new { diff --git a/src/Umbraco.Web/Services/ContentService.cs b/src/Umbraco.Web/Services/ContentService.cs index 97bf7a5e36..9f60039354 100644 --- a/src/Umbraco.Web/Services/ContentService.cs +++ b/src/Umbraco.Web/Services/ContentService.cs @@ -644,18 +644,18 @@ namespace Umbraco.Web.Services if(userId > -1) { //If a user id was passed in we use that - content.User = new Profile(userId, ""); + content.Creator = new Profile(userId, ""); } else if(_userService != null) { //If the UserService has been set for this instance of the ServiceContext //we retrieve the current users id from there. - content.User = _userService.GetCurrentBackOfficeUser(); + content.Creator = _userService.GetCurrentBackOfficeUser(); } else { //Otherwise we default to Admin user, which should always exist (almost always) - content.User = new Profile(0, "Administrator"); + content.Creator = new Profile(0, "Administrator"); } }