lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2026-01-18 19:51:45 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Getting the blogs admin UI back up and running

Browse Source 
--HG--
branch : dev
This commit is contained in:
Nathan Heskew
2010-07-14 22:39:26 -07:00
parent fd1f654b66
commit f3854ddbb6
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogAdminController.cs
View File

@@ -1,4 +1,3 @@
using System;
using System.Linq; using System.Linq;
using System.Web.Mvc; using System.Web.Mvc;
using JetBrains.Annotations; using JetBrains.Annotations;
@@ -8,7 +7,6 @@ using Orchard.Blogs.Models;
using Orchard.Blogs.Services; using Orchard.Blogs.Services;
using Orchard.Blogs.ViewModels; using Orchard.Blogs.ViewModels;
using Orchard.ContentManagement; using Orchard.ContentManagement;
using Orchard.Core.Common.Models;
using Orchard.Localization; using Orchard.Localization;
using Orchard.Mvc.Results; using Orchard.Mvc.Results;
using Orchard.Settings; using Orchard.Settings;

2
src/Orchard.Web/Modules/Orchard.Blogs/Handlers/BlogHandler.cs
View File

@@ -2,7 +2,6 @@ using JetBrains.Annotations;
using Orchard.Blogs.Drivers; using Orchard.Blogs.Drivers;
using Orchard.Blogs.Models; using Orchard.Blogs.Models;
using Orchard.ContentManagement.Handlers; using Orchard.ContentManagement.Handlers;
using Orchard.Core.Common.Models;
using Orchard.Core.Routable.Models; using Orchard.Core.Routable.Models;
using Orchard.Data; using Orchard.Data;
@@ -11,7 +10,6 @@ namespace Orchard.Blogs.Handlers {
public class BlogHandler : ContentHandler { public class BlogHandler : ContentHandler {
public BlogHandler(IRepository<BlogRecord> repository) { public BlogHandler(IRepository<BlogRecord> repository) {
Filters.Add(new ActivatingFilter<Blog>(BlogDriver.ContentType.Name)); 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(new ActivatingFilter<IsRoutable>(BlogDriver.ContentType.Name));
Filters.Add(StorageFilter.For(repository)); Filters.Add(StorageFilter.For(repository));
} }

5
src/Orchard/ContentManagement/Drivers/ContentItemTemplateResult.cs
View File

@@ -12,6 +12,11 @@ namespace Orchard.ContentManagement.Drivers {
public string TemplateName { get; set; } public string TemplateName { get; set; }
public override void Apply(BuildDisplayModelContext context) { 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; context.ViewModel.TemplateName = TemplateName;
if (context.ViewModel.GetType() != typeof(ContentItemViewModel<TContent>)) { if (context.ViewModel.GetType() != typeof(ContentItemViewModel<TContent>)) {
context.ViewModel.Adaptor = (html, viewModel) => { context.ViewModel.Adaptor = (html, viewModel) => {