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

IdentityPart as a last resort GUID for references.

Browse Source 
Adding it to htmlwidget and comment.

--HG--
branch : dev
This commit is contained in:
Suha Can
2011-03-17 14:25:23 -07:00
parent db91c88615
commit 8e6001b8fc
13 changed files with 121 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/Orchard.Web/Core/Common/Drivers/IdentityPartDriver.cs Normal file
View File

@@ -0,0 +1,30 @@
using JetBrains.Annotations;
using Orchard.ContentManagement.Drivers;
using Orchard.Core.Common.Models;
using Orchard.Localization;
namespace Orchard.Core.Common.Drivers {
[UsedImplicitly]
public class IdentityPartDriver : ContentPartDriver<IdentityPart> {
public IdentityPartDriver() {
T = NullLocalizer.Instance;
}
public Localizer T { get; set; }
protected override string Prefix {
get { return "Identity"; }
}
protected override void Importing(IdentityPart part, ContentManagement.Handlers.ImportContentContext context) {
var identity = context.Attribute(part.PartDefinition.Name, "Identifier");
if (identity != null) {
part.Identifier = identity;
}
}
protected override void Exporting(IdentityPart part, ContentManagement.Handlers.ExportContentContext context) {
context.Element(part.PartDefinition.Name).SetAttributeValue("Identifier", part.Identifier);
}
}
}

28
src/Orchard.Web/Core/Common/Handlers/IdentityPartHandler.cs Normal file
View File

@@ -0,0 +1,28 @@
using System;
using JetBrains.Annotations;
using Orchard.ContentManagement;
using Orchard.Core.Common.Models;
using Orchard.Data;
using Orchard.ContentManagement.Handlers;
namespace Orchard.Core.Common.Handlers {
[UsedImplicitly]
public class IdentityPartHandler : ContentHandler {
public IdentityPartHandler(IRepository<IdentityPartRecord> identityRepository) {
Filters.Add(StorageFilter.For(identityRepository));
OnInitializing<IdentityPart>(AssignIdentity);
}
protected void AssignIdentity(InitializingContentContext context, IdentityPart part) {
part.Identifier = Guid.NewGuid().ToString("n");
}
protected override void GetItemMetadata(GetContentItemMetadataContext context) {
var part = context.ContentItem.As<IdentityPart>();
if (part != null) {
context.Metadata.Identity.Add("Identifier", part.Identifier);
}
}
}
}

11
src/Orchard.Web/Core/Common/Migrations.cs
View File

@@ -36,5 +36,16 @@ namespace Orchard.Core.Common {
return 1;
}
public int UpdateFrom1() {
SchemaBuilder.CreateTable("IdentityPartRecord",
table => table
.ContentPartRecord()
.Column<string>("Identifier", column => column.Unlimited())
);
ContentDefinitionManager.AlterPartDefinition("IdentityPart", builder => builder.Attachable());
return 2;
}
}
}

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

@@ -0,0 +1,10 @@
using Orchard.ContentManagement;
namespace Orchard.Core.Common.Models {
public class IdentityPart : ContentPart<IdentityPartRecord> {
public string Identifier {
get { return Record.Identifier; }
set { Record.Identifier = value; }
}
}
}

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

@@ -0,0 +1,7 @@
using Orchard.ContentManagement.Records;
namespace Orchard.Core.Common.Models {
public class IdentityPartRecord : ContentPartRecord {
public virtual string Identifier { get; set; }
}
}

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

@@ -61,7 +61,11 @@
<Reference Include="System.Xml.Linq" />
</ItemGroup>
<ItemGroup>
<Compile Include="Common\Drivers\IdentityPartDriver.cs" />
<Compile Include="Common\Handlers\IdentityPartHandler.cs" />
<Compile Include="Common\Models\CommonPartVersionRecord.cs" />
<Compile Include="Common\Models\IdentityPartRecord.cs" />
<Compile Include="Common\Models\IdentityPart.cs" />
<Compile Include="Common\Services\XmlRpcHandler.cs" />
<Compile Include="Containers\Controllers\ItemController.cs" />
<Compile Include="Containers\Drivers\ContainablePartDriver.cs" />

9
src/Orchard.Web/Modules/Orchard.Comments/Handlers/CommentPartHandler.cs
View File

@@ -1,6 +1,5 @@
using JetBrains.Annotations;
using Orchard.Comments.Models;
using Orchard.ContentManagement;
using Orchard.ContentManagement.Handlers;
using Orchard.Data;
@@ -10,13 +9,5 @@ namespace Orchard.Comments.Handlers {
public CommentPartHandler(IRepository<CommentPartRecord> commentsRepository) {
Filters.Add(StorageFilter.For(commentsRepository));
}
protected override void GetItemMetadata(GetContentItemMetadataContext context) {
var part = context.ContentItem.As<CommentPart>();
if (part != null) {
context.Metadata.Identity.Add("Comment.CommentAuthor", part.Record.Author);
}
}
}
}

9
src/Orchard.Web/Modules/Orchard.Comments/Migrations.cs
View File

@@ -38,6 +38,7 @@ namespace Orchard.Comments {
cfg => cfg
.WithPart("CommentPart")
.WithPart("CommonPart")
.WithPart("IdentityPart")
);
ContentDefinitionManager.AlterTypeDefinition("Blog",
@@ -47,7 +48,13 @@ namespace Orchard.Comments {
ContentDefinitionManager.AlterPartDefinition("CommentsPart", builder => builder.Attachable());
return 1;
return 2;
}
public int UpdateFrom1() {
ContentDefinitionManager.AlterTypeDefinition("Comment", cfg => cfg.WithPart("IdentityPart"));
return 2;
}
}
}

6
src/Orchard.Web/Modules/Orchard.Setup/Recipes/blog.recipe.xml
View File

@@ -48,9 +48,9 @@
layer create Disabled /LayerRule:"false"
layer create TheHomepage /LayerRule:"url '~/'"
blog create /Slug:"blog" /Title:"Blog" /Homepage:true /Description:"This is your Orchard Blog."
widget create HtmlWidget /Title:"First Leader Aside" /Zone:"TripelFirst" /Position:"5" /Layer:"TheHomepage" /UseLoremIpsumText:true
widget create HtmlWidget /Title:"Second Leader Aside" /Zone:"TripelSecond" /Position:"5" /Layer:"TheHomepage" /UseLoremIpsumText:true
widget create HtmlWidget /Title:"Third Leader Aside" /Zone:"TripelThird" /Position:"5" /Layer:"TheHomepage" /UseLoremIpsumText:true
widget create HtmlWidget /Title:"First Leader Aside" /Zone:"TripelFirst" /Position:"5" /Layer:"TheHomepage" /Identity:"SetupHtmlWidget1" /UseLoremIpsumText:true
widget create HtmlWidget /Title:"Second Leader Aside" /Zone:"TripelSecond" /Position:"5" /Layer:"TheHomepage" /Identity:"SetupHtmlWidget2" /UseLoremIpsumText:true
widget create HtmlWidget /Title:"Third Leader Aside" /Zone:"TripelThird" /Position:"5" /Layer:"TheHomepage" /Identity:"SetupHtmlWidget3" /UseLoremIpsumText:true
menuitem create /MenuPosition:"1" /MenuText:"Home" /Url:"" /OnMainMenu:true
</Command>
</Orchard>

6
src/Orchard.Web/Modules/Orchard.Setup/Recipes/default.recipe.xml
View File

@@ -44,9 +44,9 @@
layer create Disabled /LayerRule:"false"
layer create TheHomepage /LayerRule:"url '~/'"
page create /Slug:"welcome-to-orchard" /Title:"Welcome to Orchard!" /Path:"welcome-to-orchard" /Homepage:true /Publish:true /UseWelcomeText:true
widget create HtmlWidget /Title:"First Leader Aside" /Zone:"TripelFirst" /Position:"5" /Layer:"TheHomepage" /UseLoremIpsumText:true
widget create HtmlWidget /Title:"Second Leader Aside" /Zone:"TripelSecond" /Position:"5" /Layer:"TheHomepage" /UseLoremIpsumText:true
widget create HtmlWidget /Title:"Third Leader Aside" /Zone:"TripelThird" /Position:"5" /Layer:"TheHomepage" /UseLoremIpsumText:true
widget create HtmlWidget /Title:"First Leader Aside" /Zone:"TripelFirst" /Position:"5" /Layer:"TheHomepage" /Identity:"SetupHtmlWidget1" /UseLoremIpsumText:true
widget create HtmlWidget /Title:"Second Leader Aside" /Zone:"TripelSecond" /Position:"5" /Layer:"TheHomepage" /Identity:"SetupHtmlWidget2" /UseLoremIpsumText:true
widget create HtmlWidget /Title:"Third Leader Aside" /Zone:"TripelThird" /Position:"5" /Layer:"TheHomepage" /Identity:"SetupHtmlWidget3" /UseLoremIpsumText:true
menuitem create /MenuPosition:"1" /MenuText:"Home" /Url:"" /OnMainMenu:true
</Command>
</Orchard>

11
src/Orchard.Web/Modules/Orchard.Widgets/Commands/WidgetCommands.cs
View File

@@ -34,6 +34,9 @@ namespace Orchard.Widgets.Commands {
[OrchardSwitch]
public string Layer { get; set; }
[OrchardSwitch]
public string Identity { get; set; }
[OrchardSwitch]
public string Owner { get; set; }
@@ -47,8 +50,8 @@ namespace Orchard.Widgets.Commands {
public bool Publish { get; set; }
[CommandName("widget create")]
[CommandHelp("widget create <type> /Title:<title> /Zone:<zone> /Position:<position> /Layer:<layer> [/Owner:<owner>] [/Text:<text>] [/UseLoremIpsumText:true|false]\r\n\t" + "Creates a new widget")]
[OrchardSwitches("Title,Zone,Position,Layer,Owner,Text,UseLoremIpsumText")]
[CommandHelp("widget create <type> /Title:<title> /Zone:<zone> /Position:<position> /Layer:<layer> [/Identity:<identity>] [/Owner:<owner>] [/Text:<text>] [/UseLoremIpsumText:true|false]\r\n\t" + "Creates a new widget")]
[OrchardSwitches("Title,Zone,Position,Layer,Identity,Owner,Text,UseLoremIpsumText")]
public void Create(string type) {
var widgetTypes = _widgetsService.GetWidgetTypes();
if (!widgetTypes.Contains(type)) {
@@ -81,6 +84,10 @@ namespace Orchard.Widgets.Commands {
var owner = _membershipService.GetUser(Owner);
widget.As<ICommonPart>().Owner = owner;
if (widget.Has<IdentityPart>() && !String.IsNullOrEmpty(Identity)) {
widget.As<IdentityPart>().Identifier = Identity;
}
Context.Output.WriteLine(T("Widget created successfully.").Text);
}

4
src/Orchard.Web/Modules/Orchard.Widgets/Handlers/WidgetPartHandler.cs
View File

@@ -37,10 +37,6 @@ namespace Orchard.Widgets.Handlers {
{"Action", "EditWidget"},
{"Id", context.ContentItem.Id}
};
context.Metadata.Identity.Add("Widget.Title", widget.Title);
context.Metadata.Identity.Add("Widget.Position", widget.Position);
context.Metadata.Identity.Add("Widget.Zone", widget.Zone);
}
}
}

9
src/Orchard.Web/Modules/Orchard.Widgets/Migrations.cs
View File

@@ -56,10 +56,17 @@ namespace Orchard.Widgets {
.WithPart("WidgetPart")
.WithPart("BodyPart")
.WithPart("CommonPart")
.WithPart("IdentityPart")
.WithSetting("Stereotype", "Widget")
);
return 1;
return 2;
}
public int UpdateFrom1() {
ContentDefinitionManager.AlterTypeDefinition("HtmlWidget", cfg => cfg.WithPart("IdentityPart"));
return 2;
}
}
}