lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-15 19:54:57 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Repairing some action filters and changing one more to use IWorkContextAccessor (have a few still to go)

Browse Source 
--HG--
branch : dev
This commit is contained in:
Nathan Heskew
2010-09-01 15:43:14 -07:00
parent 1c9141a988
commit d6e3ac97dd
3 changed files with 6 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/Orchard.Web/Core/Feeds/Services/FeedFilter.cs
View File

@@ -1,27 +1,22 @@
using System.Web.Mvc;
using JetBrains.Annotations;
using Orchard.Mvc.Filters;
using Orchard.Mvc.ViewModels;
namespace Orchard.Core.Feeds.Services {
[UsedImplicitly]
public class FeedFilter : FilterProvider, IResultFilter {
private readonly IFeedManager _feedManager;
private readonly IWorkContextAccessor _workContextAccessor;
public FeedFilter(IFeedManager feedManager) {
public FeedFilter(IFeedManager feedManager, IWorkContextAccessor workContextAccessor) {
_feedManager = feedManager;
_workContextAccessor = workContextAccessor;
}
public void OnResultExecuting(ResultExecutingContext filterContext) {
var model = BaseViewModel.From(filterContext.Result);
if (model == null) {
return;
}
model.Zones.AddAction("head:after", html => html.ViewContext.Writer.Write(_feedManager.GetRegisteredLinks(html)));
_workContextAccessor.GetContext(filterContext).CurrentPage.Zones["Head"].Add(html => html.ViewContext.Writer.Write(_feedManager.GetRegisteredLinks(html)), ":after");
}
public void OnResultExecuted(ResultExecutedContext filterContext) {
}
public void OnResultExecuted(ResultExecutedContext filterContext) {}
}
}

2
src/Orchard/UI/Notify/NotifyFilter.cs
View File

@@ -51,7 +51,6 @@ namespace Orchard.UI.Notify {
}
public void OnResultExecuting(ResultExecutingContext filterContext) {
#if REFACTORING
var viewResult = filterContext.Result as ViewResultBase;
// if it's not a view result, a redirect for example
@@ -82,7 +81,6 @@ namespace Orchard.UI.Notify {
if (!messageEntries.Any())
return;
#endif
var shape = _shapeHelperFactory.CreateHelper();
var messagesZone = _workContextAccessor.GetContext(filterContext).CurrentPage.Zones["Messages"];

4
src/Orchard/UI/Resources/ResourceFilter.cs
View File

@@ -4,7 +4,6 @@ using Orchard.Mvc.Filters;
using Orchard.Mvc.ViewEngines;
namespace Orchard.UI.Resources {
#if REFACTORING
public class ResourceFilter : FilterProvider, IResultFilter {
private readonly IResourceManager _resourceManager;
private readonly IWorkContextAccessor _workContextAccessor;
@@ -33,5 +32,4 @@ namespace Orchard.UI.Resources {
public void OnResultExecuted(ResultExecutedContext filterContext) {}
}
}
#endif
}