From f3854ddbb633056c2fefa6e33b53b070eeccbbb5 Mon Sep 17 00:00:00 2001
From: Nathan Heskew <nathan.heskew@microsoft.com>
Date: Wed, 14 Jul 2010 22:39:26 -0700
Subject: [PATCH] Getting the blogs admin UI back up and running

--HG--
branch : dev
---
 .../Modules/Orchard.Blogs/Controllers/BlogAdminController.cs | 2 --
 .../Modules/Orchard.Blogs/Handlers/BlogHandler.cs            | 2 --
 .../ContentManagement/Drivers/ContentItemTemplateResult.cs   | 5 +++++
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogAdminController.cs b/src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogAdminController.cs
index 027c5f5cc..d35aa02c0 100644
--- a/src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogAdminController.cs
+++ b/src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogAdminController.cs
@@ -1,4 +1,3 @@
-using System;
 using System.Linq;
 using System.Web.Mvc;
 using JetBrains.Annotations;
@@ -8,7 +7,6 @@ using Orchard.Blogs.Models;
 using Orchard.Blogs.Services;
 using Orchard.Blogs.ViewModels;
 using Orchard.ContentManagement;
-using Orchard.Core.Common.Models;
 using Orchard.Localization;
 using Orchard.Mvc.Results;
 using Orchard.Settings;
diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Handlers/BlogHandler.cs b/src/Orchard.Web/Modules/Orchard.Blogs/Handlers/BlogHandler.cs
index 586b32414..0ed267507 100644
--- a/src/Orchard.Web/Modules/Orchard.Blogs/Handlers/BlogHandler.cs
+++ b/src/Orchard.Web/Modules/Orchard.Blogs/Handlers/BlogHandler.cs
@@ -2,7 +2,6 @@ using JetBrains.Annotations;
 using Orchard.Blogs.Drivers;
 using Orchard.Blogs.Models;
 using Orchard.ContentManagement.Handlers;
-using Orchard.Core.Common.Models;
 using Orchard.Core.Routable.Models;
 using Orchard.Data;
 
@@ -11,7 +10,6 @@ namespace Orchard.Blogs.Handlers {
     public class BlogHandler : ContentHandler {
         public BlogHandler(IRepository<BlogRecord> repository) {
             Filters.Add(new ActivatingFilter<Blog>(BlogDriver.ContentType.Name));
-            Filters.Add(new ActivatingFilter<CommonAspect>(BlogDriver.ContentType.Name));
             Filters.Add(new ActivatingFilter<IsRoutable>(BlogDriver.ContentType.Name));
             Filters.Add(StorageFilter.For(repository));
         }
diff --git a/src/Orchard/ContentManagement/Drivers/ContentItemTemplateResult.cs b/src/Orchard/ContentManagement/Drivers/ContentItemTemplateResult.cs
index 11eebb603..024e92571 100644
--- a/src/Orchard/ContentManagement/Drivers/ContentItemTemplateResult.cs
+++ b/src/Orchard/ContentManagement/Drivers/ContentItemTemplateResult.cs
@@ -12,6 +12,11 @@ namespace Orchard.ContentManagement.Drivers {
         public string TemplateName { get; set; }
 
         public override void Apply(BuildDisplayModelContext context) {
+            //todo: (heskew)evaluate - for lack of having access to the full context in a driver to conditionally return results (e.g. BlogDriver item display is otherwise being overriden by the ContentPartDriver)
+            if (!string.IsNullOrWhiteSpace(context.ViewModel.TemplateName)
+                && context.ViewModel.GetType() != typeof(ContentItemViewModel<TContent>))
+                return;
+
             context.ViewModel.TemplateName = TemplateName;
             if (context.ViewModel.GetType() != typeof(ContentItemViewModel<TContent>)) {
                 context.ViewModel.Adaptor = (html, viewModel) => {