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

Doing some more refinement on the record/handler relationship

Browse Source 
--HG--
extra : convert_revision : svn%3A5ff7c347-ad56-4c35-b696-ccb81de16e03/trunk%4041358
This commit is contained in:
loudej
2009-11-19 06:06:51 +00:00
parent baba3c3eca
commit f215b13393
24 changed files with 105 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Orchard.Web/Core/Common/Models/CommonPart.cs
View File

@@ -3,7 +3,7 @@ using Orchard.Models;
using Orchard.Security;
namespace Orchard.Core.Common.Models {
public class CommonPart : ContentItemPartWithRecord<CommonRecord> {
public class CommonPart : ContentPartForRecord<CommonRecord> {
public IUser Owner { get; set; }
}
}

2
src/Orchard.Web/Core/Common/Models/RoutablePart.cs
View File

@@ -2,6 +2,6 @@ using Orchard.Core.Common.Records;
using Orchard.Models;
namespace Orchard.Core.Common.Models {
public class RoutablePart : ContentItemPartWithRecord<RoutableRecord> {
public class RoutablePart : ContentPartForRecord<RoutableRecord> {
}
}

2
src/Orchard.Web/Core/Common/Records/CommonRecord.cs
View File

@@ -2,7 +2,7 @@
using Orchard.Models.Records;
namespace Orchard.Core.Common.Records {
public class CommonRecord : ContentPartRecordBase {
public class CommonRecord : ContentPartRecord {
public virtual int OwnerId { get; set; }
public virtual DateTime? CreatedUtc { get; set; }
public virtual DateTime? ModifiedUtc { get; set; }

2
src/Orchard.Web/Core/Common/Records/RoutableRecord.cs
View File

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

2
src/Orchard.Web/Core/Settings/Models/SiteSettings.cs
View File

@@ -3,7 +3,7 @@ using Orchard.Models;
using Orchard.Settings;
namespace Orchard.Core.Settings.Models {
public sealed class SiteSettings : ContentItemPartWithRecord<SiteSettingsRecord>, ISite {
public sealed class SiteSettings : ContentPartForRecord<SiteSettingsRecord>, ISite {
public string SiteName {
get { return Record.SiteName; }
set { Record.SiteName = value; }

2
src/Orchard.Web/Core/Settings/Records/SiteSettingsRecord.cs
View File

@@ -1,7 +1,7 @@
using Orchard.Models.Records;
namespace Orchard.Core.Settings.Records {
public class SiteSettingsRecord : ContentPartRecordBase {
public class SiteSettingsRecord : ContentPartRecord {
public virtual string SiteUrl { get; set; }
public virtual string SiteName { get; set; }
public virtual string SuperUser { get; set; }

4
src/Orchard.Web/Packages/Orchard.Media/Models/MediaSettings.cs
View File

@@ -5,10 +5,10 @@ using Orchard.Models.Records;
using Orchard.UI.Models;
namespace Orchard.Media.Models {
public class MediaSettings : ContentItemPartWithRecord<MediaSettingsRecord> {
public class MediaSettings : ContentPartForRecord<MediaSettingsRecord> {
}
public class MediaSettingsRecord : ContentPartRecordBase {
public class MediaSettingsRecord : ContentPartRecord {
public virtual string RootMediaFolder { get; set; }
}

2
src/Orchard.Web/Packages/Orchard.Users/Models/User.cs
View File

@@ -2,7 +2,7 @@
using Orchard.Security;
namespace Orchard.Users.Models {
public sealed class User : ContentItemPartWithRecord<UserRecord>, IUser {
public sealed class User : ContentPartForRecord<UserRecord>, IUser {
public int Id {
get { return ContentItem.Id; }
}

2
src/Orchard.Web/Packages/Orchard.Users/Models/UserRecord.cs
View File

@@ -2,7 +2,7 @@ using System.Web.Security;
using Orchard.Models.Records;
namespace Orchard.Users.Models {
public class UserRecord : ContentPartRecordBase {
public class UserRecord : ContentPartRecord {
public virtual string UserName { get; set; }
public virtual string Email { get; set; }

5
src/Orchard.Web/Packages/Orchard.Users/Views/Admin/Index.aspx
View File

@@ -1,4 +1,5 @@
<%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage<Orchard.Users.ViewModels.UsersIndexViewModel>" %>
<%@ Import Namespace="Orchard.Models"%>
<%@ Import Namespace="Orchard.Security" %>
<%@ Import Namespace="Orchard.Mvc.Html" %>
@@ -38,10 +39,10 @@
<% foreach (var row in Model.Rows) { %>
<tr>
<td>
<%=Html.Encode(row.User.As<IUser>().UserName) %>
<%=Html.Encode(row.User.UserName) %>
</td>
<td>
<%=Html.Encode(row.User.As<IUser>().Email) %>
<%=Html.Encode(row.User.Email) %>
</td>
<td>
<%=Html.ActionLink("Edit", "Edit", new { row.User.Id })%>

46
src/Orchard.Web/Packages/Orchard.Wikis/Models/WikiSettings.cs
View File

@@ -1,46 +0,0 @@
using System.ComponentModel.DataAnnotations;
using Orchard.Data;
using Orchard.Models;
using Orchard.Models.Driver;
using Orchard.Models.Records;
using Orchard.UI.Models;
namespace Orchard.Wikis.Models {
public class WikiSettings : ContentItemPartWithRecord<WikiSettingsRecord> {
}
public class WikiSettingsRecord : ContentPartRecordBase {
public virtual bool AllowAnonymousEdits { get; set; }
[Required]
public virtual string WikiEditTheme { get; set; }
}
public class WikiSettingsHandler : ContentHandler {
public WikiSettingsHandler(IRepository<WikiSettingsRecord> repository) {
Filters.Add(new ActivatingFilter<WikiSettings>("site"));
Filters.Add(new StorageFilterForRecord<WikiSettingsRecord>(repository) { AutomaticallyCreateMissingRecord = true });
//add to user... just for fun
Filters.Add(new ActivatingFilter<WikiSettings>("user"));
}
protected override void GetEditors(GetContentEditorsContext context) {
var model = context.ContentItem.As<WikiSettings>();
if (model == null)
return;
context.Editors.Add(ModelTemplate.For(model.Record, "WikiSettings"));
}
protected override void UpdateEditors(UpdateContentContext context) {
var model = context.ContentItem.As<WikiSettings>();
if (model == null)
return;
context.Updater.TryUpdateModel(model.Record, "WikiSettings", null, null);
context.Editors.Add(ModelTemplate.For(model.Record, "WikiSettings"));
}
}
}

30
src/Orchard.Web/Packages/Orchard.Wikis/Models/WikiSettingsHandler.cs Normal file
View File

@@ -0,0 +1,30 @@
using Orchard.Data;
using Orchard.Models;
using Orchard.Models.Driver;
using Orchard.UI.Models;
namespace Orchard.Wikis.Models {
public class WikiSettingsHandler : ContentHandler {
public WikiSettingsHandler(IRepository<WikiSettingsRecord> repository) {
Filters.Add(new ActivatingFilter<ContentPartForRecord<WikiSettingsRecord>>("site"));
Filters.Add(new StorageFilterForRecord<WikiSettingsRecord>(repository) { AutomaticallyCreateMissingRecord = true });
}
protected override void GetEditors(GetContentEditorsContext context) {
var part = context.ContentItem.As<ContentPartForRecord<WikiSettingsRecord>>();
if (part == null)
return;
context.Editors.Add(ModelTemplate.For(part.Record, "WikiSettings"));
}
protected override void UpdateEditors(UpdateContentContext context) {
var part = context.ContentItem.As<ContentPartForRecord<WikiSettingsRecord>>();
if (part == null)
return;
context.Updater.TryUpdateModel(part.Record, "WikiSettings", null, null);
context.Editors.Add(ModelTemplate.For(part.Record, "WikiSettings"));
}
}
}

11
src/Orchard.Web/Packages/Orchard.Wikis/Models/WikiSettingsRecord.cs Normal file
View File

@@ -0,0 +1,11 @@
using System.ComponentModel.DataAnnotations;
using Orchard.Models.Records;
namespace Orchard.Wikis.Models {
public class WikiSettingsRecord : ContentPartRecord {
public virtual bool AllowAnonymousEdits { get; set; }
[Required]
public virtual string WikiEditTheme { get; set; }
}
}

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

@@ -64,7 +64,8 @@
<Compile Include="AdminMenu.cs" />
<Compile Include="Controllers\AdminController.cs" />
<Compile Include="Models\WikiPageHandler.cs" />
<Compile Include="Models\WikiSettings.cs" />
<Compile Include="Models\WikiSettingsHandler.cs" />
<Compile Include="Models\WikiSettingsRecord.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>