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

Simplify code in UmbracoViewPage (#12528)

Browse Source
This commit is contained in:
Bjarne Fyrstenborg
2022-06-02 15:47:47 +02:00
committed by GitHub
parent d0a752248e
commit 4238e2a4f3
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/Umbraco.Web.Common/Views/UmbracoViewPage.cs
View File

@@ -39,21 +39,19 @@ public abstract class UmbracoViewPage<TModel> : RazorPage<TModel>
return _helper;
}
_helper = Context.RequestServices.GetRequiredService<UmbracoHelper>();
TModel model = ViewData.Model;
var content = model as IPublishedContent;
if (content is null && model is IContentModel contentModel)
{
content = contentModel.Content;
}
if (content is null)
{
content = UmbracoContext?.PublishedRequest?.PublishedContent;
}
content ??= UmbracoContext?.PublishedRequest?.PublishedContent;
_helper = Context.RequestServices.GetRequiredService<UmbracoHelper>();
if (!(content is null))
if (content is not null)
{
_helper.AssignedContentItem = content;
}