yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #7544 from stevetemple/v8/feature/obsolete-creatorname-writername

Browse Source 
Obsolete CreatorName and WriterName on IPublishedContent
This commit is contained in:
Bjarke Berg
2020-02-11 13:08:15 +01:00
committed by GitHub
parent 8e2ed68b88 6b46167180
commit 3c1076e023
6 changed files with 24 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Core/Models/PublishedContent/IPublishedContent.cs
View File

@@ -63,6 +63,7 @@ namespace Umbraco.Core.Models.PublishedContent
/// <summary>
/// Gets the name of the user who created the content item.
/// </summary>
[Obsolete("Use CreatorName(IUserService) extension instead")]
string CreatorName { get; }
/// <summary>
@@ -78,6 +79,7 @@ namespace Umbraco.Core.Models.PublishedContent
/// <summary>
/// Gets the name of the user who last updated the content item.
/// </summary>
[Obsolete("Use WriterName(IUserService) extension instead")]
string WriterName { get; }
/// <summary>

2
src/Umbraco.Web/Macros/PublishedContentHashtableConverter.cs
View File

@@ -248,8 +248,10 @@ namespace Umbraco.Web.Macros
public string UrlSegment => throw new NotImplementedException();
[Obsolete("Use WriterName(IUserService) extension instead")]
public string WriterName { get; }
[Obsolete("Use CreatorName(IUserService) extension instead")]
public string CreatorName { get; }
public int WriterId => _inner.WriterId;

2
src/Umbraco.Web/Models/PublishedContentBase.cs
View File

@@ -54,6 +54,7 @@ namespace Umbraco.Web.Models
public abstract int CreatorId { get; }
/// <inheritdoc />
[Obsolete("Use CreatorName(IUserService) extension instead")]
public abstract string CreatorName { get; }
/// <inheritdoc />
@@ -63,6 +64,7 @@ namespace Umbraco.Web.Models
public abstract int WriterId { get; }
/// <inheritdoc />
[Obsolete("Use WriterName(IUserService) extension instead")]
public abstract string WriterName { get; }
/// <inheritdoc />

2
src/Umbraco.Web/PublishedCache/NuCache/PublishedContent.cs
View File

@@ -163,6 +163,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
public override int CreatorId => _contentNode.CreatorId;
/// <inheritdoc />
[Obsolete("Use CreatorName(IUserService) extension instead")]
public override string CreatorName => GetProfileNameById(_contentNode.CreatorId);
/// <inheritdoc />
@@ -172,6 +173,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
public override int WriterId => ContentData.WriterId;
/// <inheritdoc />
[Obsolete("Use WriterName(IUserService) extension instead")]
public override string WriterName => GetProfileNameById(ContentData.WriterId);
/// <inheritdoc />

2
src/Umbraco.Web/PublishedCache/PublishedMember.cs
View File

@@ -140,9 +140,11 @@ namespace Umbraco.Web.PublishedCache
public override string UrlSegment => throw new NotSupportedException();
// TODO: ARGH! need to fix this - this is not good because it uses ApplicationContext.Current
[Obsolete("Use WriterName(IUserService) extension instead")]
public override string WriterName => _member.GetCreatorProfile().Name;
// TODO: ARGH! need to fix this - this is not good because it uses ApplicationContext.Current
[Obsolete("Use CreatorName(IUserService) extension instead")]
public override string CreatorName => _member.GetCreatorProfile().Name;
public override int WriterId => _member.CreatorId;

14
src/Umbraco.Web/PublishedContentExtensions.cs
View File

@@ -28,6 +28,20 @@ namespace Umbraco.Web
private static UmbracoContext UmbracoContext => Current.UmbracoContext;
private static ISiteDomainHelper SiteDomainHelper => Current.Factory.GetInstance<ISiteDomainHelper>();
#region Creator/Writer Names
public static string CreatorName(this IPublishedContent content, IUserService userService)
{
return userService.GetProfileById(content.CreatorId)?.Name;
}
public static string WriterName(this IPublishedContent content, IUserService userService)
{
return userService.GetProfileById(content.WriterId)?.Name;
}
#endregion
#region IsComposedOf
/// <summary>