lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-09-22 20:13:50 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

- Fixing OrchardControllerFactory.GetAreaName to align it with what MVC 2 does internally.

Browse Source 
--HG--
branch : dev
This commit is contained in:
Suha Can
2010-03-01 11:20:52 -08:00
parent 62902e2b38
commit 4487940e60
1 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/Orchard/Mvc/OrchardControllerFactory.cs
View File

@@ -1,4 +1,3 @@
using System;
using System.Web.Mvc;
using System.Web.Routing;
using Autofac;
@@ -27,14 +26,29 @@ namespace Orchard.Mvc {
return base.CreateController(requestContext, controllerName);
}
private string GetAreaName(RouteData context) {
object area;
if (context.Values.TryGetValue("area", out area)) {
return Convert.ToString(area);
public static string GetAreaName(RouteBase route) {
var routeWithArea = route as IRouteWithArea;
if (routeWithArea != null) {
return routeWithArea.Area;
}
var castRoute = route as Route;
if (castRoute != null && castRoute.DataTokens != null) {
return castRoute.DataTokens["area"] as string;
}
return null;
}
public static string GetAreaName(RouteData routeData) {
object area;
if (routeData.DataTokens.TryGetValue("area", out area)) {
return area as string;
}
return GetAreaName(routeData.Route);
}
public static IContainer GetRequestContainer(RouteData routeData) {
object dataTokenValue;
if (routeData != null &&