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

Move IPublishedContent.Url() to ext method

Browse Source
This commit is contained in:
Stephan
2019-04-24 14:25:41 +02:00
parent 25b8c8a565
commit bb0331e9cc
29 changed files with 105 additions and 169 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -15,13 +15,6 @@ namespace Umbraco.Web.Models
[DebuggerDisplay("Content Id: {Id}}")]
public abstract class PublishedContentBase : IPublishedContent
{
protected PublishedContentBase(IUmbracoContextAccessor umbracoContextAccessor)
{
UmbracoContextAccessor = umbracoContextAccessor ?? throw new ArgumentNullException(nameof(umbracoContextAccessor));
}
protected IUmbracoContextAccessor UmbracoContextAccessor { get; }
#region ContentType
public abstract IPublishedContentType ContentType { get; }
@@ -76,32 +69,6 @@ namespace Umbraco.Web.Models
/// <inheritdoc />
public abstract DateTime UpdateDate { get; }
/// <inheritdoc />
/// <remarks>
/// The url of documents are computed by the document url providers. The url of medias are computed by the media url providers.
/// </remarks>
public virtual string Url(string culture = null, UrlMode mode = UrlMode.Auto)
{
var umbracoContext = UmbracoContextAccessor.UmbracoContext;
if (umbracoContext == null)
throw new InvalidOperationException("Cannot compute Url for a content item when UmbracoContext is null.");
if (umbracoContext.UrlProvider == null)
throw new InvalidOperationException("Cannot compute Url for a content item when UmbracoContext.UrlProvider is null.");
switch (ContentType.ItemType)
{
case PublishedItemType.Content:
return umbracoContext.UrlProvider.GetUrl(this, mode, culture);
case PublishedItemType.Media:
return umbracoContext.UrlProvider.GetMediaUrl(this, mode, culture, Constants.Conventions.Media.File);
default:
throw new NotSupportedException();
}
}
/// <inheritdoc />
public abstract DateTime CultureDate(string culture = null);