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

Refactor IPublishedContent.Url()

Browse Source
This commit is contained in:
Stephan
2019-04-16 20:03:07 +02:00
parent 2b54cc50ab
commit 11ef00c63d
31 changed files with 91 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -76,15 +76,12 @@ namespace Umbraco.Web.Models
/// <inheritdoc />
public abstract DateTime UpdateDate { get; }
/// <inheritdoc />
public virtual string Url => GetUrl();
/// <inheritdoc />
/// <remarks>
/// The url of documents are computed by the document url providers. The url of medias are, at the moment,
/// computed here from the 'umbracoFile' property -- but we should move to media url providers at some point.
/// </remarks>
public virtual string GetUrl(string culture = null) // TODO: consider .GetCulture("fr-FR").Url
public virtual string Url(string culture = null, UrlMode mode = UrlMode.Auto)
{
switch (ItemType)
{
@@ -96,9 +93,12 @@ namespace Umbraco.Web.Models
if (umbracoContext.UrlProvider == null)
throw new InvalidOperationException("Cannot compute Url for a content item when UmbracoContext.UrlProvider is null.");
return umbracoContext.UrlProvider.GetUrl(this, culture);
return umbracoContext.UrlProvider.GetUrl(this, mode, culture);
case PublishedItemType.Media:
if (mode == UrlMode.Absolute)
throw new NotSupportedException("Absolute urls are not supported for media items.");
var prop = GetProperty(Constants.Conventions.Media.File);
if (prop?.GetValue() == null)
{