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

Web.Routing - PublishedContentRequest template naming

Browse Source
This commit is contained in:
Stephan
2013-02-05 06:37:36 -01:00
parent 47ab187780
commit cc0ad0b089
3 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Umbraco.Tests/Routing/ContentFinderByNiceUrlAndTemplateTests.cs
View File

@@ -35,8 +35,8 @@ namespace Umbraco.Tests.Routing
Assert.IsTrue(result);
Assert.IsNotNull(docRequest.PublishedContent);
Assert.IsNotNull(docRequest.Template);
Assert.AreEqual("blah".ToUpperInvariant(), docRequest.Template.ToUpperInvariant());
Assert.IsNotNull(docRequest.TemplateAlias);
Assert.AreEqual("blah".ToUpperInvariant(), docRequest.TemplateAlias.ToUpperInvariant());
}
}
}

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

@@ -274,7 +274,7 @@ namespace Umbraco.Web.Mvc
//the template Alias should always be already saved with a safe name.
//if there are hyphens in the name and there is a hijacked route, then the Action will need to be attributed
// with the action name attribute.
var templateName = global::umbraco.cms.helpers.Casing.SafeAlias(publishedContentRequest.Template.Split('.')[0]);
var templateName = global::umbraco.cms.helpers.Casing.SafeAlias(publishedContentRequest.TemplateAlias.Split('.')[0]);
def.ActionName = templateName;
}

18
src/Umbraco.Web/Routing/PublishedContentRequest.cs
View File

@@ -181,9 +181,9 @@ namespace Umbraco.Web.Routing
}
/// <summary>
/// Gets the template to use to display the requested content.
/// Gets the alias of the template to use to display the requested content.
/// </summary>
public string Template
public string TemplateAlias
{
get
{
@@ -194,14 +194,14 @@ namespace Umbraco.Web.Routing
/// <summary>
/// Tries to set the template to use to display the requested content.
/// </summary>
/// <param name="value">The name of the template.</param>
/// <returns>A value indicating whether a valid template with the specified name was found.</returns>
/// <remarks>Setting the template resets <c>RenderingEngine</c> to <c>Unknown</c>.</remarks>
public bool TrySetTemplate(string name)
/// <param name="alias">The alias of the template.</param>
/// <returns>A value indicating whether a valid template with the specified alias was found.</returns>
/// <remarks>Setting the template refreshes <c>RenderingEngine</c>.</remarks>
public bool TrySetTemplate(string alias)
{
this.RenderingEngine = Core.RenderingEngine.Unknown; // reset
if (string.IsNullOrWhiteSpace(name))
if (string.IsNullOrWhiteSpace(alias))
{
this.TemplateModel = null;
return true;
@@ -209,9 +209,9 @@ namespace Umbraco.Web.Routing
else
{
// NOTE - can we stil get it with whitespaces in it due to old legacy bugs?
name = name.Replace(" ", "");
alias = alias.Replace(" ", "");
var model = ApplicationContext.Current.Services.FileService.GetTemplate(name);
var model = ApplicationContext.Current.Services.FileService.GetTemplate(alias);
if (model == null)
{
this.TemplateModel = null;