- Support for MVC areas as Orchard modules (part1)

--HG--
branch : dev
This commit is contained in:
Suha Can
2010-03-02 18:11:08 -08:00
parent afb9f1800e
commit c281c2a313
2 changed files with 6 additions and 1 deletions

View File

@@ -29,6 +29,11 @@ namespace Orchard.Mvc {
areaName = controllerNamespace.Split('.').Skip(2).FirstOrDefault(); areaName = controllerNamespace.Split('.').Skip(2).FirstOrDefault();
} }
else if (assemblySimpleName == "Orchard.Web" &&
controllerNamespace.StartsWith("Orchard.Web.Areas.")) {
areaName = controllerNamespace.Split('.').Skip(3).FirstOrDefault();
}
else if (extension != null) { else if (extension != null) {
areaName = extension.Descriptor.Name; areaName = extension.Descriptor.Name;
} }

View File

@@ -53,7 +53,7 @@ namespace Orchard.Mvc.ViewEngines {
var modules = _extensionManager.ActiveExtensions() var modules = _extensionManager.ActiveExtensions()
.Where(x => x.Descriptor.ExtensionType == "Module"); .Where(x => x.Descriptor.ExtensionType == "Module" || x.Descriptor.ExtensionType == "Area");
var moduleLocations = modules.Select(x => Path.Combine(x.Descriptor.Location, x.Descriptor.Name)); var moduleLocations = modules.Select(x => Path.Combine(x.Descriptor.Location, x.Descriptor.Name));
var moduleViewEngines = _viewEngineProviders var moduleViewEngines = _viewEngineProviders