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

V8: Support culture variant URLs in multi URL picker (#7130)

Browse Source 
Thanks, Kenn - great work as usual 👍
This commit is contained in:
Kenn Jacobsen
2020-01-17 13:58:18 +01:00
committed by emma burstow
parent 12e88fde42
commit bcf4c97270
3 changed files with 67 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/Umbraco.Web/Editors/EntityController.cs
View File

@@ -206,6 +206,35 @@ namespace Umbraco.Web.Editors
throw new HttpResponseException(HttpStatusCode.NotFound);
}
/// <summary>
/// Gets the url of an entity
/// </summary>
/// <param name="udi">UDI of the entity to fetch URL for</param>
/// <param name="culture">The culture to fetch the URL for</param>
/// <returns>The URL or path to the item</returns>
public HttpResponseMessage GetUrl(Udi udi, string culture = "*")
{
var intId = Services.EntityService.GetId(udi);
if (!intId.Success)
throw new HttpResponseException(HttpStatusCode.NotFound);
UmbracoEntityTypes entityType;
switch(udi.EntityType)
{
case Constants.UdiEntityType.Document:
entityType = UmbracoEntityTypes.Document;
break;
case Constants.UdiEntityType.Media:
entityType = UmbracoEntityTypes.Media;
break;
case Constants.UdiEntityType.Member:
entityType = UmbracoEntityTypes.Member;
break;
default:
throw new HttpResponseException(HttpStatusCode.NotFound);
}
return GetUrl(intId.Result, entityType, culture);
}
/// <summary>
/// Gets the url of an entity
/// </summary>
@@ -303,7 +332,9 @@ namespace Umbraco.Web.Editors
[HttpGet]
public UrlAndAnchors GetUrlAndAnchors(int id, string culture = "*")
{
var url = UmbracoContext.UrlProvider.GetUrl(id);
culture = culture ?? ClientCulture();
var url = UmbracoContext.UrlProvider.GetUrl(id, culture: culture);
var anchorValues = Services.ContentService.GetAnchorValuesFromRTEs(id, culture);
return new UrlAndAnchors(url, anchorValues);
}