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

Fix member cached macros and change macro rendering to be async

Browse Source
This commit is contained in:
Bjarke Berg
2021-04-20 14:26:25 +02:00
parent 8123fee867
commit 5afc509d5e
17 changed files with 82 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/Umbraco.Web.Common/UmbracoHelper.cs
View File

@@ -107,9 +107,9 @@ namespace Umbraco.Cms.Web.Common
/// </summary>
/// <param name="alias">The alias.</param>
/// <returns></returns>
public IHtmlEncodedString RenderMacro(string alias)
public async Task<IHtmlEncodedString> RenderMacroAsync(string alias)
{
return _componentRenderer.RenderMacro(AssignedContentItem?.Id ?? 0, alias, null);
return await _componentRenderer.RenderMacroAsync(AssignedContentItem?.Id ?? 0, alias, null);
}
/// <summary>
@@ -118,9 +118,9 @@ namespace Umbraco.Cms.Web.Common
/// <param name="alias">The alias.</param>
/// <param name="parameters">The parameters.</param>
/// <returns></returns>
public IHtmlEncodedString RenderMacro(string alias, object parameters)
public async Task<IHtmlEncodedString> RenderMacroAsync(string alias, object parameters)
{
return _componentRenderer.RenderMacro(AssignedContentItem?.Id ?? 0, alias, parameters?.ToDictionary<object>());
return await _componentRenderer.RenderMacroAsync(AssignedContentItem?.Id ?? 0, alias, parameters?.ToDictionary<object>());
}
/// <summary>
@@ -129,9 +129,9 @@ namespace Umbraco.Cms.Web.Common
/// <param name="alias">The alias.</param>
/// <param name="parameters">The parameters.</param>
/// <returns></returns>
public IHtmlEncodedString RenderMacro(string alias, IDictionary<string, object> parameters)
public async Task<IHtmlEncodedString> RenderMacroAsync(string alias, IDictionary<string, object> parameters)
{
return _componentRenderer.RenderMacro(AssignedContentItem?.Id ?? 0, alias, parameters);
return await _componentRenderer.RenderMacroAsync(AssignedContentItem?.Id ?? 0, alias, parameters);
}
#endregion