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

Updates NotFoundHandlerHelper to use IDomainService and fixes IDomainRepository with the Exists and GetByName methods (with tests)

Browse Source
This commit is contained in:
Shannon
2015-05-13 16:45:08 +10:00
parent 2cd5b252d5
commit 416dcdf90f
8 changed files with 91 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Umbraco.Web/Routing/ContentFinderByLegacy404.cs
View File

@@ -27,7 +27,8 @@ namespace Umbraco.Web.Routing
//TODO: Is there a better way to extract this value? at least we're not relying on singletons here though
pcr.RoutingContext.UmbracoContext.HttpContext.Request.ServerVariables["SERVER_NAME"],
pcr.RoutingContext.UmbracoContext.Application.Services.EntityService,
new PublishedContentQuery(pcr.RoutingContext.UmbracoContext.ContentCache, pcr.RoutingContext.UmbracoContext.MediaCache));
new PublishedContentQuery(pcr.RoutingContext.UmbracoContext.ContentCache, pcr.RoutingContext.UmbracoContext.MediaCache),
pcr.RoutingContext.UmbracoContext.Application.Services.DomainService);
IPublishedContent content = null;

14
src/Umbraco.Web/Routing/NotFoundHandlerHelper.cs
View File

@@ -229,12 +229,14 @@ namespace Umbraco.Web.Routing
/// </param>
/// <param name="entityService"></param>
/// <param name="publishedContentQuery"></param>
/// <param name="domainService"></param>
/// <returns></returns>
internal static int? GetCurrentNotFoundPageId(
IContentErrorPage[] error404Collection,
string requestServerName,
IEntityService entityService,
PublishedContentQuery publishedContentQuery)
IEntityService entityService,
ITypedPublishedContentQuery publishedContentQuery,
IDomainService domainService)
{
if (error404Collection.Count() > 1)
{
@@ -243,13 +245,13 @@ namespace Umbraco.Web.Routing
//TODO: Remove the dependency on this legacy Domain service,
// in 7.3 the real domain service should be passed in as a parameter.
if (Domain.Exists(requestServerName))
if (domainService.Exists(requestServerName))
{
var d = Domain.GetDomain(requestServerName);
var d = domainService.GetByName(requestServerName);
// test if a 404 page exists with current culture
cultureErr = error404Collection
.FirstOrDefault(x => x.Culture == d.Language.CultureAlias);
.FirstOrDefault(x => x.Culture == d.Language.IsoCode);
if (cultureErr != null)
{
@@ -289,7 +291,7 @@ namespace Umbraco.Web.Routing
/// <param name="entityService"></param>
/// <param name="publishedContentQuery"></param>
/// <returns></returns>
internal static int? GetContentIdFromErrorPageConfig(IContentErrorPage errorPage, IEntityService entityService, PublishedContentQuery publishedContentQuery)
internal static int? GetContentIdFromErrorPageConfig(IContentErrorPage errorPage, IEntityService entityService, ITypedPublishedContentQuery publishedContentQuery)
{
if (errorPage.HasContentId) return errorPage.ContentId;