lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-14 19:04:51 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Make the engine view discovery more correct

Browse Source 
For themes, the pattern is slighty different than for modules,
Also, we need to interleave the different views engine in between
themes and base themes, so that overrides between Razor and WebForms
work as excpected.

--HG--
branch : dev
This commit is contained in:
Renaud Paquay
2010-12-08 15:40:15 -08:00
parent a81d4c0821
commit ff6c5f3edc
1 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/Orchard/Mvc/ViewEngines/ThemeAwareness/ThemeAwareViewEngine.cs
View File

@@ -82,21 +82,18 @@ namespace Orchard.Mvc.ViewEngines.ThemeAwareness {
// 3. Active features from modules in dependency order // 3. Active features from modules in dependency order
var engines = Enumerable.Empty<IViewEngine>(); var engines = Enumerable.Empty<IViewEngine>();
var themeLocation = theme.Location + "/" + theme.Id;
// 1. current theme // 1. current theme
var themeParams = new CreateThemeViewEngineParams { VirtualPath = themeLocation }; engines = engines.Concat(CreateThemeViewEngines(theme));
engines = engines.Concat(_viewEngineProviders.Select(vep => vep.CreateThemeViewEngine(themeParams)));
// 2. Base themes of the current theme (in "base" order) // 2. Base themes of the current theme (in "base" order)
var baseThemes = GetBaseThemes(theme); engines = GetBaseThemes(theme).Aggregate(engines, (current, baseTheme) => current.Concat(CreateThemeViewEngines(baseTheme)));
// 3. Active features from modules in dependency order // 3. Active features from modules in dependency order
var enabledModules = _extensionManager.EnabledFeatures(_shellDescriptor) var enabledModules = _extensionManager.EnabledFeatures(_shellDescriptor)
.Reverse() // reverse from (C <= B <= A) to (A => B => C) .Reverse() // reverse from (C <= B <= A) to (A => B => C)
.Where(fd => !DefaultExtensionTypes.IsTheme(fd.Extension.ExtensionType)/*core + modules*/); .Where(fd => DefaultExtensionTypes.IsModule(fd.Extension.ExtensionType));
var allLocations = baseThemes.Concat(enabledModules) var allLocations = enabledModules.Concat(enabledModules)
.Select(fd => fd.Extension.Location + "/" + fd.Extension.Id) .Select(fd => fd.Extension.Location + "/" + fd.Extension.Id)
.Distinct(StringComparer.OrdinalIgnoreCase) .Distinct(StringComparer.OrdinalIgnoreCase)
.ToList(); .ToList();
@@ -108,7 +105,13 @@ namespace Orchard.Mvc.ViewEngines.ThemeAwareness {
}); });
} }
private IEnumerable<FeatureDescriptor> GetBaseThemes(ExtensionDescriptor themeExtension) { private IEnumerable<IViewEngine> CreateThemeViewEngines(ExtensionDescriptor theme) {
var themeLocation = theme.Location + "/" + theme.Id;
var themeParams = new CreateThemeViewEngineParams {VirtualPath = themeLocation};
return _viewEngineProviders.Select(vep => vep.CreateThemeViewEngine(themeParams));
}
private IEnumerable<ExtensionDescriptor> GetBaseThemes(ExtensionDescriptor themeExtension) {
if (themeExtension.Id.Equals("TheAdmin", StringComparison.OrdinalIgnoreCase)) { if (themeExtension.Id.Equals("TheAdmin", StringComparison.OrdinalIgnoreCase)) {
// Special case: conceptually, the base themes of "TheAdmin" is the list of all // Special case: conceptually, the base themes of "TheAdmin" is the list of all
// enabled themes. This is so that any enabled theme can have controller/action/views // enabled themes. This is so that any enabled theme can have controller/action/views
@@ -116,11 +119,12 @@ namespace Orchard.Mvc.ViewEngines.ThemeAwareness {
return _extensionManager return _extensionManager
.EnabledFeatures(_shellDescriptor) .EnabledFeatures(_shellDescriptor)
.Reverse() // reverse from (C <= B <= A) to (A => B => C) .Reverse() // reverse from (C <= B <= A) to (A => B => C)
.Where(fd => DefaultExtensionTypes.IsTheme(fd.Extension.ExtensionType)); .Select(fd => fd.Extension)
.Where(fd => DefaultExtensionTypes.IsTheme(fd.ExtensionType));
} }
else { else {
var availableFeatures = _extensionManager.AvailableFeatures(); var availableFeatures = _extensionManager.AvailableFeatures();
var list = new List<FeatureDescriptor>(); var list = new List<ExtensionDescriptor>();
while(true) { while(true) {
if (themeExtension == null) if (themeExtension == null)
break; break;
@@ -135,12 +139,12 @@ namespace Orchard.Mvc.ViewEngines.ThemeAwareness {
} }
// Protect against potential infinite loop // Protect against potential infinite loop
if (list.Contains(baseFeature)) { if (list.Contains(baseFeature.Extension)) {
Logger.Error("Base theme '{0}' of theme '{1}' ignored, as it seems there is recursion in base themes", themeExtension.BaseTheme, themeExtension.Id); Logger.Error("Base theme '{0}' of theme '{1}' ignored, as it seems there is recursion in base themes", themeExtension.BaseTheme, themeExtension.Id);
break; break;
} }
list.Add(baseFeature); list.Add(baseFeature.Extension);
themeExtension = baseFeature.Extension; themeExtension = baseFeature.Extension;
} }