From 47f27e8eec5b23b365c464f866e8f40020fb5dc5 Mon Sep 17 00:00:00 2001 From: Kenn Jacobsen Date: Mon, 30 Sep 2019 19:14:26 +0200 Subject: [PATCH] Remove "RenderModel" from various comments throughout the code (#4814) --- src/Umbraco.Web/Mvc/RenderIndexActionSelectorAttribute.cs | 2 +- src/Umbraco.Web/Mvc/RenderRouteHandler.cs | 4 ++-- src/Umbraco.Web/Mvc/RenderViewEngine.cs | 2 +- src/Umbraco.Web/Mvc/RouteDefinition.cs | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Umbraco.Web/Mvc/RenderIndexActionSelectorAttribute.cs b/src/Umbraco.Web/Mvc/RenderIndexActionSelectorAttribute.cs index fa80107181..99aa88b3e2 100644 --- a/src/Umbraco.Web/Mvc/RenderIndexActionSelectorAttribute.cs +++ b/src/Umbraco.Web/Mvc/RenderIndexActionSelectorAttribute.cs @@ -7,7 +7,7 @@ using System.Web.Mvc; namespace Umbraco.Web.Mvc { /// - /// 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 /// internal class RenderIndexActionSelectorAttribute : ActionMethodSelectorAttribute diff --git a/src/Umbraco.Web/Mvc/RenderRouteHandler.cs b/src/Umbraco.Web/Mvc/RenderRouteHandler.cs index 284c1344b6..c30f83170b 100644 --- a/src/Umbraco.Web/Mvc/RenderRouteHandler.cs +++ b/src/Umbraco.Web/Mvc/RenderRouteHandler.cs @@ -86,7 +86,7 @@ namespace Umbraco.Web.Mvc 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 - 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.UmbracoContextDataToken, UmbracoContext); //required for UmbracoViewPage } @@ -233,7 +233,7 @@ namespace Umbraco.Web.Mvc } /// - /// Returns a RouteDefinition object based on the current renderModel + /// Returns a RouteDefinition object based on the current content request /// /// /// diff --git a/src/Umbraco.Web/Mvc/RenderViewEngine.cs b/src/Umbraco.Web/Mvc/RenderViewEngine.cs index 0fa22616b2..f8a636c87b 100644 --- a/src/Umbraco.Web/Mvc/RenderViewEngine.cs +++ b/src/Umbraco.Web/Mvc/RenderViewEngine.cs @@ -89,7 +89,7 @@ namespace Umbraco.Web.Mvc 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... - // 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)) return true; diff --git a/src/Umbraco.Web/Mvc/RouteDefinition.cs b/src/Umbraco.Web/Mvc/RouteDefinition.cs index 6acafabe1c..89b0467dc3 100644 --- a/src/Umbraco.Web/Mvc/RouteDefinition.cs +++ b/src/Umbraco.Web/Mvc/RouteDefinition.cs @@ -19,7 +19,7 @@ namespace Umbraco.Web.Mvc /// - /// The current RenderModel found for the request + /// Everything related to the current content request including the requested content /// public PublishedRequest PublishedRequest { get; set; }