lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2026-02-09 09:16:41 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

ThemeFilter is wholly responsible for determining if a request is themed. Previously, LayoutAwareViewEngine had some theme business logic which made it impossible to have an un-themed admin controller.

Browse Source 
--HG--
branch : dev
This commit is contained in:
Dave Reed
2011-02-18 15:03:38 -08:00
parent 4768b99d51
commit 3ad849c22d
2 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Orchard/Mvc/ViewEngines/ThemeAwareness/LayoutAwareViewEngine.cs
View File

@@ -36,8 +36,7 @@ namespace Orchard.Mvc.ViewEngines.ThemeAwareness {
return viewResult;
}
// Don't layout the result if it's not an Admin controller and it's disabled
if ( !AdminFilter.IsApplied(controllerContext.RequestContext) && !ThemeFilter.IsApplied(controllerContext.RequestContext) ) {
if (!ThemeFilter.IsApplied(controllerContext.RequestContext)) {
return viewResult;
}

15
src/Orchard/Themes/ThemeFilter.cs
View File

@@ -2,13 +2,24 @@ using System.Linq;
using System.Web.Mvc;
using System.Web.Routing;
using Orchard.Mvc.Filters;
using Orchard.UI.Admin;
namespace Orchard.Themes {
public class ThemeFilter : FilterProvider, IActionFilter, IResultFilter {
public void OnActionExecuting(ActionExecutingContext filterContext) {
var attribute = GetThemedAttribute(filterContext.ActionDescriptor);
if (attribute != null && attribute.Enabled) {
Apply(filterContext.RequestContext);
if (AdminFilter.IsApplied(filterContext.RequestContext)) {
// admin are themed by default
if (attribute == null || attribute.Enabled) {
Apply(filterContext.RequestContext);
}
}
else {
// non-admin are explicitly themed
// Don't layout the result if it's not an Admin controller and it's disabled
if (attribute != null && attribute.Enabled) {
Apply(filterContext.RequestContext);
}
}
}