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

Remove "RenderModel" from various comments throughout the code (#4814)

Browse Source
This commit is contained in:
Kenn Jacobsen
2019-09-30 19:14:26 +02:00
committed by Sebastiaan Janssen
parent 3fd412e962
commit 47f27e8eec
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Web/Mvc/RenderIndexActionSelectorAttribute.cs
View File

@@ -7,7 +7,7 @@ using System.Web.Mvc;
namespace Umbraco.Web.Mvc namespace Umbraco.Web.Mvc
{ {
/// <summary> /// <summary>
/// A custom ActionMethodSelector which will ensure that the RenderMvcController.Index(RenderModel model) action will be executed /// A custom ActionMethodSelector which will ensure that the RenderMvcController.Index(ContentModel model) action will be executed
/// if the /// if the
/// </summary> /// </summary>
internal class RenderIndexActionSelectorAttribute : ActionMethodSelectorAttribute internal class RenderIndexActionSelectorAttribute : ActionMethodSelectorAttribute

4
src/Umbraco.Web/Mvc/RenderRouteHandler.cs
View File

@@ -86,7 +86,7 @@ namespace Umbraco.Web.Mvc
internal void SetupRouteDataForRequest(ContentModel contentModel, RequestContext requestContext, PublishedRequest frequest) internal void SetupRouteDataForRequest(ContentModel contentModel, RequestContext requestContext, PublishedRequest frequest)
{ {
//put essential data into the data tokens, the 'umbraco' key is required to be there for the view engine //put essential data into the data tokens, the 'umbraco' key is required to be there for the view engine
requestContext.RouteData.DataTokens.Add(Core.Constants.Web.UmbracoDataToken, contentModel); //required for the RenderModelBinder and view engine requestContext.RouteData.DataTokens.Add(Core.Constants.Web.UmbracoDataToken, contentModel); //required for the ContentModelBinder and view engine
requestContext.RouteData.DataTokens.Add(Core.Constants.Web.PublishedDocumentRequestDataToken, frequest); //required for RenderMvcController requestContext.RouteData.DataTokens.Add(Core.Constants.Web.PublishedDocumentRequestDataToken, frequest); //required for RenderMvcController
requestContext.RouteData.DataTokens.Add(Core.Constants.Web.UmbracoContextDataToken, UmbracoContext); //required for UmbracoViewPage requestContext.RouteData.DataTokens.Add(Core.Constants.Web.UmbracoContextDataToken, UmbracoContext); //required for UmbracoViewPage
} }
@@ -233,7 +233,7 @@ namespace Umbraco.Web.Mvc
} }
/// <summary> /// <summary>
/// Returns a RouteDefinition object based on the current renderModel /// Returns a RouteDefinition object based on the current content request
/// </summary> /// </summary>
/// <param name="requestContext"></param> /// <param name="requestContext"></param>
/// <param name="request"></param> /// <param name="request"></param>

2
src/Umbraco.Web/Mvc/RenderViewEngine.cs
View File

@@ -89,7 +89,7 @@ namespace Umbraco.Web.Mvc
var umbracoToken = controllerContext.GetDataTokenInViewContextHierarchy(Core.Constants.Web.UmbracoDataToken); var umbracoToken = controllerContext.GetDataTokenInViewContextHierarchy(Core.Constants.Web.UmbracoDataToken);
// first check if we're rendering a partial view for the back office, or surface controller, etc... // first check if we're rendering a partial view for the back office, or surface controller, etc...
// anything that is not IUmbracoRenderModel as this should only pertain to Umbraco views. // anything that is not ContentModel as this should only pertain to Umbraco views.
if (isPartial && !(umbracoToken is ContentModel)) if (isPartial && !(umbracoToken is ContentModel))
return true; return true;

2
src/Umbraco.Web/Mvc/RouteDefinition.cs
View File

@@ -19,7 +19,7 @@ namespace Umbraco.Web.Mvc
/// <summary> /// <summary>
/// The current RenderModel found for the request /// Everything related to the current content request including the requested content
/// </summary> /// </summary>
public PublishedRequest PublishedRequest { get; set; } public PublishedRequest PublishedRequest { get; set; }