lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-09-22 12:09:41 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Moving Orchard.Core/Common handlers into Models

Browse Source 
--HG--
branch : dev
rename : src/Orchard.Web/Core/Common/Providers/BodyAspectHandler.cs => src/Orchard.Web/Core/Common/Models/BodyAspectHandler.cs
rename : src/Orchard.Web/Core/Common/Providers/CommonAspectHandler.cs => src/Orchard.Web/Core/Common/Models/CommonAspectHandler.cs
This commit is contained in:
Nathan Heskew
2010-03-03 00:40:32 -08:00
parent c281c2a313
commit 98b483f827
6 changed files with 27 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Orchard.Core.Tests/Common/Providers/CommonAspectProviderTests.cs
View File

@@ -1,14 +1,12 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using Autofac.Builder;
using JetBrains.Annotations;
using Moq;
using NUnit.Framework;
using Orchard.ContentManagement.Aspects;
using Orchard.Core.Common.Models;
using Orchard.Core.Common.Providers;
using Orchard.Core.Common.Records;
using Orchard.ContentManagement;
using Orchard.ContentManagement.Handlers;

4
src/Orchard.Web/Core/Common/Providers/BodyAspectHandler.cs → src/Orchard.Web/Core/Common/Models/BodyAspectHandler.cs
View File

@@ -2,10 +2,10 @@ using Orchard.Core.Common.Records;
using Orchard.Data;
using Orchard.ContentManagement.Handlers;
namespace Orchard.Core.Common.Providers {
namespace Orchard.Core.Common.Models {
public class BodyAspectHandler : ContentHandler {
public BodyAspectHandler(IRepository<BodyRecord> bodyRepository) {
Filters.Add(StorageFilter.For(bodyRepository));
}
}
}
}

35
src/Orchard.Web/Core/Common/Providers/CommonAspectHandler.cs → src/Orchard.Web/Core/Common/Models/CommonAspectHandler.cs
View File

@@ -1,4 +1,3 @@
using Orchard.Core.Common.Models;
using Orchard.Core.Common.Records;
using Orchard.Core.Common.ViewModels;
using Orchard.Data;
@@ -9,7 +8,7 @@ using Orchard.ContentManagement.ViewModels;
using Orchard.Security;
using Orchard.Services;
namespace Orchard.Core.Common.Providers {
namespace Orchard.Core.Common.Models {
public class CommonAspectHandler : ContentHandler {
private readonly IClock _clock;
private readonly IAuthenticationService _authenticationService;
@@ -119,24 +118,24 @@ namespace Orchard.Core.Common.Providers {
// add handlers that will update records when aspect properties are set
aspect.OwnerField.Setter(user => {
if (user == null) {
aspect.Record.OwnerId = 0;
}
else {
aspect.Record.OwnerId = user.ContentItem.Id;
}
return user;
});
if (user == null) {
aspect.Record.OwnerId = 0;
}
else {
aspect.Record.OwnerId = user.ContentItem.Id;
}
return user;
});
aspect.ContainerField.Setter(container => {
if (container == null) {
aspect.Record.Container = null;
}
else {
aspect.Record.Container = container.ContentItem.Record;
}
return container;
});
if (container == null) {
aspect.Record.Container = null;
}
else {
aspect.Record.Container = container.ContentItem.Record;
}
return container;
});
}

9
src/Orchard.Web/Core/Common/Models/RoutableAspectHandler.cs
View File

@@ -3,12 +3,15 @@ using JetBrains.Annotations;
using Orchard.ContentManagement;
using Orchard.ContentManagement.Aspects;
using Orchard.ContentManagement.Handlers;
using Orchard.Core.Common.Records;
using Orchard.Data;
namespace Orchard.Core.Common.Models {
[UsedImplicitly]
public class RoutableAspectHandler : ContentHandler
{
public RoutableAspectHandler() {
public class RoutableAspectHandler : ContentHandler {
public RoutableAspectHandler(IRepository<RoutableRecord> repository) {
Filters.Add(StorageFilter.For(repository));
OnGetEditorViewModel<RoutableAspect>((context, routable) => {
var containerPathBuilder = new StringBuilder();
var container = context.ContentItem.As<ICommonAspect>().Container;

11
src/Orchard.Web/Core/Common/Providers/RoutableAspectHandler.cs
View File

@@ -1,11 +0,0 @@
using Orchard.Core.Common.Records;
using Orchard.Data;
using Orchard.ContentManagement.Handlers;
namespace Orchard.Core.Common.Providers {
public class RoutableAspectHandler : ContentHandler {
public RoutableAspectHandler(IRepository<RoutableRecord> repository) {
Filters.Add(StorageFilter.For(repository));
}
}
}

5
src/Orchard.Web/Core/Orchard.Core.csproj
View File

@@ -71,12 +71,11 @@
<Compile Include="Common\Services\IRoutableService.cs" />
<Compile Include="Common\Services\RoutableService.cs" />
<Compile Include="Common\Utilities\LazyField.cs" />
<Compile Include="Common\Providers\CommonAspectHandler.cs" />
<Compile Include="Common\Models\CommonAspectHandler.cs" />
<Compile Include="Common\Models\CommonAspect.cs" />
<Compile Include="Common\Providers\BodyAspectHandler.cs" />
<Compile Include="Common\Models\BodyAspectHandler.cs" />
<Compile Include="Common\Models\BodyAspect.cs" />
<Compile Include="Common\Models\RoutableAspect.cs" />
<Compile Include="Common\Providers\RoutableAspectHandler.cs" />
<Compile Include="Common\Records\BodyRecord.cs" />
<Compile Include="Common\Records\CommonRecord.cs" />
<Compile Include="Common\Records\RoutableRecord.cs" />