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

Changed how surface controllers are routed: because we don't load plugins in via App_Plugins/[PackageName] like we did in v5 which meant that we can autoroute all plugin controllers with their own areas, in v4 we have to do something different.

Browse Source 
Instead (because we still want areas), we have an attribute called PluginControllerAttribute which allows a dev to assign an area name as a string. A package developer should always ensure that all of their plugin controllers are assigned to the same
area. This also lets us get rid of the GUID id part of the plugin (hopefully we can leave it out, just need to run some tests). Since we have areas, package devs can then put their views into
their own folders and not clutter up the local devs ~/Views folder. Perhaps we use App_Plugins/[PackageName] for the views like we did in v5 but need to ask on the mail list. Otherwise it will be the standard MVC:
~/Areas/[AreaName]/Views which will still also clutter up the local devs view folder if they are using Areas.
This commit is contained in:
Shannon Deminick
2012-09-26 11:04:07 +07:00
parent 7b7e3b82f1
commit 332b42aa49
12 changed files with 224 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/Umbraco.Web/WebBootManager.cs
View File

@@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web.Mvc;
using System.Web.Routing;
using Umbraco.Core;
@@ -124,12 +125,42 @@ namespace Umbraco.Web
);
defaultRoute.RouteHandler = new RenderRouteHandler(ControllerBuilder.Current.GetControllerFactory());
//now we need to find the surface controllers and route them too
var surfaceControllers = SurfaceControllerResolver.Current.SurfaceControllers;
//create a custom area for them
var surfaceControllerArea = new SurfaceControllerArea(surfaceControllers);
//register it
RouteTable.Routes.RegisterArea(surfaceControllerArea);
var umbracoPath = GlobalSettings.UmbracoMvcArea;
//we need to find the surface controllers and route them
var surfaceControllers = SurfaceControllerResolver.Current.SurfaceControllers.ToArray();
//local surface controllers do not contain the attribute
var localSurfaceControlleres = surfaceControllers.Where(x => x.GetType().GetCustomAttribute<PluginControllerAttribute>(false) == null);
foreach (var s in localSurfaceControlleres)
{
var meta = s.GetMetadata();
var route = RouteTable.Routes.MapRoute(
string.Format("umbraco-{0}-{1}", "surface", meta.ControllerName),
umbracoPath + "/Surface/" + meta.ControllerName + "/{action}/{id}",//url to match
new { controller = meta.ControllerName, action = "Index", id = UrlParameter.Optional },
new[] { meta.ControllerNamespace }); //only match this namespace
route.DataTokens.Add("area", umbracoPath); //only match this area
route.DataTokens.Add("umbraco", "surface"); //ensure the umbraco token is set
}
//need to get the plugin controllers that are unique to each area (group by)
//TODO: One day when we have more plugin controllers, we will need to do a group by on ALL of them to pass into the ctor of PluginControllerArea
var groupedAreas = surfaceControllers.GroupBy(controller => controller.GetMetadata().AreaName);
//loop through each area defined amongst the controllers
foreach(var g in groupedAreas)
{
//create an area for the controllers (this will throw an exception if all controllers are not in the same area)
var pluginControllerArea = new PluginControllerArea(g);
//register it
RouteTable.Routes.RegisterArea(pluginControllerArea);
}
RouteTable.Routes.MapRoute(
"Account",
"account/{action}/{id}",
new { controller = "Account", action = "Index", id = UrlParameter.Optional }
);
}