lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-15 19:54:57 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Adding some spike/concept work as context to refine model processing.

Browse Source 
--HG--
extra : convert_revision : svn%3A5ff7c347-ad56-4c35-b696-ccb81de16e03/trunk%4041259
This commit is contained in:
loudej
2009-11-18 18:21:39 +00:00
parent 7073054037
commit 322c25df0e
27 changed files with 251 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
src/Orchard.Web/Core/Common/Models/CommonDriver.cs Normal file
View File

@@ -0,0 +1,54 @@
using Orchard.Core.Common.Records;
using Orchard.Data;
using Orchard.Models;
using Orchard.Models.Driver;
using Orchard.Security;
using Orchard.Services;
namespace Orchard.Core.Common.Models {
public class CommonDriver : ModelDriverWithRecord<CommonRecord> {
private readonly IClock _clock;
private readonly IAuthenticationService _authenticationService;
private readonly IModelManager _modelManager;
public CommonDriver(
IRepository<CommonRecord> repository,
IClock clock,
IAuthenticationService authenticationService,
IModelManager modelManager)
: base(repository) {
_clock = clock;
_authenticationService = authenticationService;
_modelManager = modelManager;
}
protected override void Create(CreateModelContext context) {
var instance = context.Instance.As<CommonModel>();
if (instance != null && instance.Record != null) {
if (instance.Record.CreatedUtc == null) {
instance.Record.CreatedUtc = _clock.UtcNow;
}
if (instance.Record.ModifiedUtc == null) {
instance.Record.ModifiedUtc = _clock.UtcNow;
}
if (instance.Record.OwnerId == 0) {
instance.Owner = _authenticationService.GetAuthenticatedUser();
if (instance.Owner != null)
instance.Record.OwnerId = instance.Owner.Id;
}
}
base.Create(context);
}
protected override void Loaded(LoadModelContext context) {
var instance = context.Instance.As<CommonModel>();
if (instance != null && instance.Record != null) {
if (instance.Record.OwnerId != 0) {
instance.Owner = _modelManager.Get(instance.Record.OwnerId).As<IUser>();
}
}
base.Loaded(context);
}
}
}

9
src/Orchard.Web/Core/Common/Models/CommonModel.cs Normal file
View File

@@ -0,0 +1,9 @@
using Orchard.Core.Common.Records;
using Orchard.Models;
using Orchard.Security;
namespace Orchard.Core.Common.Models {
public class CommonModel : ModelPartWithRecord<CommonRecord> {
public IUser Owner { get; set; }
}
}

7
src/Orchard.Web/Core/Common/Models/ContentDriver.cs Normal file
View File

@@ -0,0 +1,7 @@
using Orchard.Models.Driver;
namespace Orchard.Core.Common.Models {
public class ContentDriver : ModelDriver {
}
}

8
src/Orchard.Web/Core/Common/Models/ContentModel.cs Normal file
View File

@@ -0,0 +1,8 @@
using Orchard.Models;
namespace Orchard.Core.Common.Models {
public class ContentModel : ModelPart {
public string Body { get; set; }
public string Format { get; set; }
}
}

10
src/Orchard.Web/Core/Common/Models/RoutableDriver.cs Normal file
View File

@@ -0,0 +1,10 @@
using Orchard.Core.Common.Records;
using Orchard.Data;
using Orchard.Models.Driver;
namespace Orchard.Core.Common.Models {
public class RoutableDriver : ModelDriverWithRecord<RoutableRecord> {
public RoutableDriver(IRepository<RoutableRecord> repository) : base(repository) {
}
}
}

7
src/Orchard.Web/Core/Common/Models/RoutableModel.cs Normal file
View File

@@ -0,0 +1,7 @@
using Orchard.Core.Common.Records;
using Orchard.Models;
namespace Orchard.Core.Common.Models {
public class RoutableModel : ModelPartWithRecord<RoutableRecord> {
}
}

1
src/Orchard.Web/Core/Common/Package.txt Normal file
View File

@@ -0,0 +1 @@
Name: Content

10
src/Orchard.Web/Core/Common/Records/CommonRecord.cs Normal file
View File

@@ -0,0 +1,10 @@
using System;
using Orchard.Models.Records;
namespace Orchard.Core.Common.Records {
public class CommonRecord : ModelPartRecord {
public virtual int OwnerId { get; set; }
public virtual DateTime? CreatedUtc { get; set; }
public virtual DateTime? ModifiedUtc { get; set; }
}
}

8
src/Orchard.Web/Core/Common/Records/RoutableRecord.cs Normal file
View File

@@ -0,0 +1,8 @@
using Orchard.Models.Records;
namespace Orchard.Core.Common.Records {
public class RoutableRecord : ModelPartRecord {
public virtual string Title { get; set; }
public virtual string Slug { get; set; }
}
}

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

@@ -61,6 +61,14 @@
<Reference Include="System.Web.Mobile" />
</ItemGroup>
<ItemGroup>
<Compile Include="Common\Models\CommonDriver.cs" />
<Compile Include="Common\Models\CommonModel.cs" />
<Compile Include="Common\Models\ContentDriver.cs" />
<Compile Include="Common\Models\ContentModel.cs" />
<Compile Include="Common\Models\RoutableModel.cs" />
<Compile Include="Common\Models\RoutableDriver.cs" />
<Compile Include="Common\Records\CommonRecord.cs" />
<Compile Include="Common\Records\RoutableRecord.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="XmlRpc\Controllers\HomeController.cs" />
<Compile Include="XmlRpc\Controllers\LiveWriterController.cs" />
@@ -76,6 +84,7 @@
<Compile Include="XmlRpc\XmlRpcContext.cs" />
</ItemGroup>
<ItemGroup>
<Content Include="Common\Package.txt" />
<Content Include="Web.config" />
<Content Include="XmlRpc\Package.txt" />
<Content Include="XmlRpc\Views\Home\Index.aspx" />
@@ -117,7 +126,7 @@
<WebProjectProperties>
<UseIIS>False</UseIIS>
<AutoAssignPort>True</AutoAssignPort>
<DevelopmentServerPort>52289</DevelopmentServerPort>
<DevelopmentServerPort>53609</DevelopmentServerPort>
<DevelopmentServerVPath>/</DevelopmentServerVPath>
<IISUrl>
</IISUrl>

2
src/Orchard.Web/Packages/Orchard.CmsPages/Orchard.CmsPages.csproj
View File

@@ -177,7 +177,7 @@
<WebProjectProperties>
<UseIIS>False</UseIIS>
<AutoAssignPort>True</AutoAssignPort>
<DevelopmentServerPort>65251</DevelopmentServerPort>
<DevelopmentServerPort>53589</DevelopmentServerPort>
<DevelopmentServerVPath>/</DevelopmentServerVPath>
<IISUrl>
</IISUrl>

2
src/Orchard.Web/Packages/Orchard.Media/Orchard.Media.csproj
View File

@@ -143,7 +143,7 @@
<WebProjectProperties>
<UseIIS>False</UseIIS>
<AutoAssignPort>True</AutoAssignPort>
<DevelopmentServerPort>65259</DevelopmentServerPort>
<DevelopmentServerPort>53597</DevelopmentServerPort>
<DevelopmentServerVPath>/</DevelopmentServerVPath>
<IISUrl>
</IISUrl>

2
src/Orchard.Web/Packages/Orchard.Roles/Orchard.Roles.csproj
View File

@@ -127,7 +127,7 @@
<WebProjectProperties>
<UseIIS>False</UseIIS>
<AutoAssignPort>True</AutoAssignPort>
<DevelopmentServerPort>18551</DevelopmentServerPort>
<DevelopmentServerPort>53605</DevelopmentServerPort>
<DevelopmentServerVPath>/</DevelopmentServerVPath>
<IISUrl>
</IISUrl>

2
src/Orchard.Web/Packages/Orchard.Users/Orchard.Users.csproj
View File

@@ -127,7 +127,7 @@
<WebProjectProperties>
<UseIIS>False</UseIIS>
<AutoAssignPort>True</AutoAssignPort>
<DevelopmentServerPort>65271</DevelopmentServerPort>
<DevelopmentServerPort>53601</DevelopmentServerPort>
<DevelopmentServerVPath>/</DevelopmentServerVPath>
<IISUrl>
</IISUrl>

2
src/Orchard.Web/Packages/Orchard.Wikis/AdminMenu.cs
View File

@@ -7,7 +7,7 @@ namespace Orchard.Wikis {
public void GetNavigation(NavigationBuilder builder) {
builder.Add("Wiki", "9",
menu => menu
.Add("Wiki Pages", "1.0", item => item.Action("Index", "Admin", new { area = "Orchard.Wiki" }))
.Add("Wiki Pages", "1.0", item => item.Action("Index", "Admin", new { area = "Orchard.Wikis" }))
);
}
}

32
src/Orchard.Web/Packages/Orchard.Wikis/Controllers/AdminController.cs
View File

@@ -1,13 +1,33 @@
using System.Web.Mvc;
using Orchard.Core.Common.Models;
using Orchard.Models;
using Orchard.Mvc.ViewModels;
using Orchard.Security;
namespace Orchard.Wikis.Controllers
{
public class AdminController : Controller
{
public ActionResult Index()
{
namespace Orchard.Wikis.Controllers {
public class AdminController : Controller {
private readonly IModelManager _modelManager;
public AdminController(IModelManager modelManager) {
_modelManager = modelManager;
}
public ActionResult Index() {
return View(new AdminViewModel());
}
public IUser CurrentUser { get; set; }
public ActionResult Create() {
var page = _modelManager.New("wikipage");
_modelManager.Create(page);
return RedirectToAction("View", new{page.Id});
}
public ActionResult View(int id) {
var page = _modelManager.Get(id).As<CommonModel>();
return View(page);
}
}
}

19
src/Orchard.Web/Packages/Orchard.Wikis/Models/WikiPageDriver.cs Normal file
View File

@@ -0,0 +1,19 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
using Orchard.Core.Common.Models;
using Orchard.Models.Driver;
namespace Orchard.Wikis.Models {
public class WikiPageDriver : ModelDriver {
protected override void New(NewModelContext context) {
if (context.ModelType == "wikipage") {
context.Builder
.Weld<CommonModel>()
.Weld<RoutableModel>()
.Weld<ContentModel>();
}
}
}
}

8
src/Orchard.Web/Packages/Orchard.Wikis/Orchard.Wikis.csproj
View File

@@ -63,6 +63,7 @@
<ItemGroup>
<Compile Include="AdminMenu.cs" />
<Compile Include="Controllers\AdminController.cs" />
<Compile Include="Models\WikiPageDriver.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
@@ -76,11 +77,14 @@
<Project>{2D1D92BB-4555-4CBE-8D0E-63563D6CE4C6}</Project>
<Name>Orchard</Name>
</ProjectReference>
<ProjectReference Include="..\..\Core\Orchard.Core.csproj">
<Project>{9916839C-39FC-4CEB-A5AF-89CA7E87119F}</Project>
<Name>Orchard.Core</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Folder Include="App_Data\" />
<Folder Include="Content\" />
<Folder Include="Models\" />
<Folder Include="Scripts\" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
@@ -114,7 +118,7 @@
<WebProjectProperties>
<UseIIS>False</UseIIS>
<AutoAssignPort>True</AutoAssignPort>
<DevelopmentServerPort>1275</DevelopmentServerPort>
<DevelopmentServerPort>53613</DevelopmentServerPort>
<DevelopmentServerVPath>/</DevelopmentServerVPath>
<IISUrl>
</IISUrl>

1
src/Orchard.Web/Packages/Orchard.Wikis/Views/Admin/Index.aspx
View File

@@ -14,6 +14,7 @@
<% Html.BeginForm(); %>
<div class="yui-g">
<h2>Wiki Admin</h2>
<p><%=Html.ActionLink("Create", "Create") %></p>
</div>
<% Html.EndForm(); %>
<% Html.Include("Footer"); %>

2
src/Orchard.Web/Packages/TinyMce/TinyMce.csproj
View File

@@ -151,7 +151,7 @@
<WebProjectProperties>
<UseIIS>False</UseIIS>
<AutoAssignPort>True</AutoAssignPort>
<DevelopmentServerPort>65255</DevelopmentServerPort>
<DevelopmentServerPort>53593</DevelopmentServerPort>
<DevelopmentServerVPath>/</DevelopmentServerVPath>
<IISUrl>
</IISUrl>