From d6e3ac97dde10f1a41a67032cec5b01d4a7cd91b Mon Sep 17 00:00:00 2001
From: Nathan Heskew <nathan.heskew@microsoft.com>
Date: Wed, 1 Sep 2010 15:43:14 -0700
Subject: [PATCH] Repairing some action filters and changing one more to use
 IWorkContextAccessor (have a few still to go)

--HG--
branch : dev
---
 src/Orchard.Web/Core/Feeds/Services/FeedFilter.cs | 15 +++++----------
 src/Orchard/UI/Notify/NotifyFilter.cs             |  2 --
 src/Orchard/UI/Resources/ResourceFilter.cs        |  4 +---
 3 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/src/Orchard.Web/Core/Feeds/Services/FeedFilter.cs b/src/Orchard.Web/Core/Feeds/Services/FeedFilter.cs
index 6fac01150..52e272354 100644
--- a/src/Orchard.Web/Core/Feeds/Services/FeedFilter.cs
+++ b/src/Orchard.Web/Core/Feeds/Services/FeedFilter.cs
@@ -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) {}
     }
 }
\ No newline at end of file
diff --git a/src/Orchard/UI/Notify/NotifyFilter.cs b/src/Orchard/UI/Notify/NotifyFilter.cs
index 142b7b02b..f33238bff 100644
--- a/src/Orchard/UI/Notify/NotifyFilter.cs
+++ b/src/Orchard/UI/Notify/NotifyFilter.cs
@@ -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"];
diff --git a/src/Orchard/UI/Resources/ResourceFilter.cs b/src/Orchard/UI/Resources/ResourceFilter.cs
index 5e36e0bff..3467cbbd2 100644
--- a/src/Orchard/UI/Resources/ResourceFilter.cs
+++ b/src/Orchard/UI/Resources/ResourceFilter.cs
@@ -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
\ No newline at end of file
+}
\ No newline at end of file