mirror of
https://github.com/OrchardCMS/Orchard.git
synced 2025-11-28 17:32:44 +08:00
Hooked up "cascade delete" for BlogPost so when a blog post's parent blog gets removed, the blog posts under it will get removed too.
--HG-- extra : convert_revision : svn%3A5ff7c347-ad56-4c35-b696-ccb81de16e03/trunk%4045501
This commit is contained in:
@@ -2,7 +2,7 @@
|
||||
<PropertyGroup>
|
||||
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
|
||||
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
|
||||
<ProductVersion>9.0.21022</ProductVersion>
|
||||
<ProductVersion>9.0.30729</ProductVersion>
|
||||
<SchemaVersion>2.0</SchemaVersion>
|
||||
<ProjectGuid>{50B779EA-EC00-4699-84C0-03B395C365D2}</ProjectGuid>
|
||||
<ProjectTypeGuids>{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
|
||||
@@ -187,27 +187,6 @@
|
||||
<Content Include="Themes\TheAdmin\Views\menu.ascx" />
|
||||
<Content Include="Themes\TheAdmin\Views\user.ascx" />
|
||||
<Content Include="Themes\TheAdmin\Views\header.ascx" />
|
||||
<Content Include="Themes\Times\Content\Images\bodyBackground.gif" />
|
||||
<Content Include="Themes\Times\Content\Images\bodyBackgroundgrey.gif" />
|
||||
<Content Include="Themes\Times\Content\Images\footerBackground.gif" />
|
||||
<Content Include="Themes\Times\Content\Images\mainBackground.gif" />
|
||||
<Content Include="Themes\Times\Content\Images\mainBackground.png" />
|
||||
<Content Include="Themes\Times\Content\Images\mainBackgroundgrey.gif" />
|
||||
<Content Include="Themes\Times\Content\Images\mainBackgroundgrey.png" />
|
||||
<Content Include="Themes\Times\Content\Images\navDivider.gif" />
|
||||
<Content Include="Themes\Times\Content\Images\sidebarBackground.gif" />
|
||||
<Content Include="Themes\Times\Styles\blog.css" />
|
||||
<Content Include="Themes\Times\Styles\site.css" />
|
||||
<Content Include="Themes\Times\Theme.gif" />
|
||||
<Content Include="Themes\Times\Theme.txt" />
|
||||
<Content Include="Themes\Times\Views\DisplayTemplates\Items\Blogs.Blog.ascx" />
|
||||
<Content Include="Themes\Times\Views\DisplayTemplates\Items\Blogs.Blog.Summary.ascx" />
|
||||
<Content Include="Themes\Times\Views\DisplayTemplates\Items\Blogs.BlogPost.Summary.ascx" />
|
||||
<Content Include="Themes\Times\Views\DisplayTemplates\Items\Pages.Page.ascx" />
|
||||
<Content Include="Themes\Times\Views\DisplayTemplates\Parts\Blogs.BlogPost.List.ascx" />
|
||||
<Content Include="Themes\Times\Views\footer.ascx" />
|
||||
<Content Include="Themes\Times\Views\layout.ascx" />
|
||||
<Content Include="Themes\Times\Views\menu.ascx" />
|
||||
<Content Include="Themes\Web.config" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
@@ -249,6 +228,9 @@
|
||||
<IISUrl>
|
||||
</IISUrl>
|
||||
<NTLMAuthentication>False</NTLMAuthentication>
|
||||
<UseCustomServer>False</UseCustomServer>
|
||||
<CustomServerUrl>
|
||||
</CustomServerUrl>
|
||||
<SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
|
||||
</WebProjectProperties>
|
||||
</FlavorProperties>
|
||||
|
||||
@@ -19,12 +19,7 @@ namespace Orchard.Blogs.Models {
|
||||
Filters.Add(new ActivatingFilter<BodyAspect>(BlogPostDriver.ContentType.Name));
|
||||
Filters.Add(new StorageFilter<CommonVersionRecord>(commonRepository));
|
||||
|
||||
OnCreated<BlogPost>((context, bp) => bp.Blog.PostCount++);
|
||||
OnRemoved<BlogPost>((context, bp) => bp.Blog.PostCount--);
|
||||
|
||||
|
||||
OnCreating<BlogPost>((context, blogPost) =>
|
||||
{
|
||||
OnCreating<BlogPost>((context, blogPost) => {
|
||||
string slug = !string.IsNullOrEmpty(blogPost.Slug)
|
||||
? blogPost.Slug
|
||||
: routableService.Slugify(blogPost.Title);
|
||||
@@ -34,6 +29,13 @@ namespace Orchard.Blogs.Models {
|
||||
bp => bp.Slug.StartsWith(slug)).Select(
|
||||
bp => bp.Slug));
|
||||
});
|
||||
OnCreated<BlogPost>((context, bp) => bp.Blog.PostCount++);
|
||||
OnRemoved<BlogPost>((context, bp) => bp.Blog.PostCount--);
|
||||
|
||||
OnRemoved<Blog>(
|
||||
(context, bp) =>
|
||||
blogPostService.Get(context.ContentItem.As<Blog>()).ToList().ForEach(
|
||||
blogPost => context.ContentManager.Remove(blogPost.ContentItem)));
|
||||
}
|
||||
}
|
||||
}
|
||||
19
src/Orchard/ContentManagement/Handlers/ContentContextBase.cs
Normal file
19
src/Orchard/ContentManagement/Handlers/ContentContextBase.cs
Normal file
@@ -0,0 +1,19 @@
|
||||
using Orchard.ContentManagement.Records;
|
||||
|
||||
namespace Orchard.ContentManagement.Handlers {
|
||||
public class ContentContextBase {
|
||||
protected ContentContextBase (ContentItem contentItem) {
|
||||
ContentItem = contentItem;
|
||||
Id = contentItem.Id;
|
||||
ContentType = contentItem.ContentType;
|
||||
ContentItemRecord = contentItem.Record;
|
||||
ContentManager = contentItem.ContentManager;
|
||||
}
|
||||
|
||||
public int Id { get; private set; }
|
||||
public string ContentType { get; private set; }
|
||||
public ContentItem ContentItem { get; private set; }
|
||||
public ContentItemRecord ContentItemRecord { get; private set; }
|
||||
public IContentManager ContentManager { get; private set; }
|
||||
}
|
||||
}
|
||||
@@ -1,22 +1,6 @@
|
||||
using System;
|
||||
using Orchard.ContentManagement.Records;
|
||||
|
||||
namespace Orchard.ContentManagement.Handlers {
|
||||
|
||||
public class ContentContextBase {
|
||||
protected ContentContextBase (ContentItem contentItem) {
|
||||
ContentItem = contentItem;
|
||||
Id = contentItem.Id;
|
||||
ContentType = contentItem.ContentType;
|
||||
ContentItemRecord = contentItem.Record;
|
||||
}
|
||||
|
||||
public int Id { get; set; }
|
||||
public string ContentType { get; set; }
|
||||
public ContentItem ContentItem { get; set; }
|
||||
public ContentItemRecord ContentItemRecord { get; set; }
|
||||
}
|
||||
|
||||
public class LoadContentContext : ContentContextBase {
|
||||
public LoadContentContext(ContentItem contentItem) : base(contentItem) {
|
||||
ContentItemVersionRecord = contentItem.VersionRecord;
|
||||
@@ -24,33 +8,4 @@ namespace Orchard.ContentManagement.Handlers {
|
||||
|
||||
public ContentItemVersionRecord ContentItemVersionRecord { get; set; }
|
||||
}
|
||||
|
||||
public class PublishContentContext : ContentContextBase {
|
||||
public PublishContentContext(ContentItem contentItem, ContentItemVersionRecord previousItemVersionRecord) : base(contentItem) {
|
||||
PublishingItemVersionRecord = contentItem.VersionRecord;
|
||||
PreviousItemVersionRecord = previousItemVersionRecord;
|
||||
}
|
||||
|
||||
public ContentItemVersionRecord PublishingItemVersionRecord { get; set; }
|
||||
public ContentItemVersionRecord PreviousItemVersionRecord { get; set; }
|
||||
}
|
||||
|
||||
public class RemoveContentContext : ContentContextBase {
|
||||
public RemoveContentContext(ContentItem contentItem) : base(contentItem) {
|
||||
}
|
||||
}
|
||||
|
||||
public class VersionContentContext {
|
||||
public int Id { get; set; }
|
||||
public string ContentType { get; set; }
|
||||
|
||||
public ContentItemRecord ContentItemRecord { get; set; }
|
||||
public ContentItemVersionRecord ExistingItemVersionRecord { get; set; }
|
||||
public ContentItemVersionRecord BuildingItemVersionRecord { get; set; }
|
||||
|
||||
public ContentItem ExistingContentItem { get; set; }
|
||||
public ContentItem BuildingContentItem { get; set; }
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,13 @@
|
||||
using Orchard.ContentManagement.Records;
|
||||
|
||||
namespace Orchard.ContentManagement.Handlers {
|
||||
public class PublishContentContext : ContentContextBase {
|
||||
public PublishContentContext(ContentItem contentItem, ContentItemVersionRecord previousItemVersionRecord) : base(contentItem) {
|
||||
PublishingItemVersionRecord = contentItem.VersionRecord;
|
||||
PreviousItemVersionRecord = previousItemVersionRecord;
|
||||
}
|
||||
|
||||
public ContentItemVersionRecord PublishingItemVersionRecord { get; set; }
|
||||
public ContentItemVersionRecord PreviousItemVersionRecord { get; set; }
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,6 @@
|
||||
namespace Orchard.ContentManagement.Handlers {
|
||||
public class RemoveContentContext : ContentContextBase {
|
||||
public RemoveContentContext(ContentItem contentItem) : base(contentItem) {
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,15 @@
|
||||
using Orchard.ContentManagement.Records;
|
||||
|
||||
namespace Orchard.ContentManagement.Handlers {
|
||||
public class VersionContentContext {
|
||||
public int Id { get; set; }
|
||||
public string ContentType { get; set; }
|
||||
|
||||
public ContentItemRecord ContentItemRecord { get; set; }
|
||||
public ContentItemVersionRecord ExistingItemVersionRecord { get; set; }
|
||||
public ContentItemVersionRecord BuildingItemVersionRecord { get; set; }
|
||||
|
||||
public ContentItem ExistingContentItem { get; set; }
|
||||
public ContentItem BuildingContentItem { get; set; }
|
||||
}
|
||||
}
|
||||
@@ -127,6 +127,10 @@
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Compile Include="ContentManagement\Aspects\ICommonAspect.cs" />
|
||||
<Compile Include="ContentManagement\Handlers\ContentContextBase.cs" />
|
||||
<Compile Include="ContentManagement\Handlers\PublishContentContext.cs" />
|
||||
<Compile Include="ContentManagement\Handlers\RemoveContentContext.cs" />
|
||||
<Compile Include="ContentManagement\Handlers\VersionContentContext.cs" />
|
||||
<Compile Include="Tasks\Scheduling\IScheduledTask.cs" />
|
||||
<Compile Include="ContentManagement\ContentExtensions.cs" />
|
||||
<Compile Include="ContentManagement\ContentItem.cs" />
|
||||
|
||||
Reference in New Issue
Block a user