From da9bb275ac46388a15ee706a57096ce3163b5c7a Mon Sep 17 00:00:00 2001 From: Dave Reed Date: Mon, 18 Oct 2010 10:36:27 -0700 Subject: [PATCH 1/5] Rename file Editor to Edit --HG-- branch : dev --- src/Orchard.Web/Modules/Orchard.Users/Orchard.Users.csproj | 2 +- .../Views/Items/{User.Editor.cshtml => User.Edit.cshtml} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename src/Orchard.Web/Modules/Orchard.Users/Views/Items/{User.Editor.cshtml => User.Edit.cshtml} (100%) diff --git a/src/Orchard.Web/Modules/Orchard.Users/Orchard.Users.csproj b/src/Orchard.Web/Modules/Orchard.Users/Orchard.Users.csproj index e103d50b0..911af7915 100644 --- a/src/Orchard.Web/Modules/Orchard.Users/Orchard.Users.csproj +++ b/src/Orchard.Web/Modules/Orchard.Users/Orchard.Users.csproj @@ -119,7 +119,7 @@ - + Designer diff --git a/src/Orchard.Web/Modules/Orchard.Users/Views/Items/User.Editor.cshtml b/src/Orchard.Web/Modules/Orchard.Users/Views/Items/User.Edit.cshtml similarity index 100% rename from src/Orchard.Web/Modules/Orchard.Users/Views/Items/User.Editor.cshtml rename to src/Orchard.Web/Modules/Orchard.Users/Views/Items/User.Edit.cshtml From a834b760fcc4cd5ac35628926497346477bbbc39 Mon Sep 17 00:00:00 2001 From: Dave Reed Date: Mon, 18 Oct 2010 11:48:51 -0700 Subject: [PATCH 2/5] Add missing file to csproj --HG-- branch : dev --- src/Orchard.Web/Core/Orchard.Core.csproj | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Orchard.Web/Core/Orchard.Core.csproj b/src/Orchard.Web/Core/Orchard.Core.csproj index 401f49ce3..e26fd93c7 100644 --- a/src/Orchard.Web/Core/Orchard.Core.csproj +++ b/src/Orchard.Web/Core/Orchard.Core.csproj @@ -390,6 +390,7 @@ + From 56d3008aa0bc9591b1b88c4f32ac55a0b93d13e5 Mon Sep 17 00:00:00 2001 From: Nathan Heskew Date: Mon, 18 Oct 2010 12:48:17 -0700 Subject: [PATCH 3/5] Updating the order of zones in TheThemeMachine's Theme.txt to match the order of zones in its Layout.cshtml --HG-- branch : dev --- src/Orchard.Web/Themes/TheThemeMachine/Theme.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Orchard.Web/Themes/TheThemeMachine/Theme.txt b/src/Orchard.Web/Themes/TheThemeMachine/Theme.txt index 12f3ec41d..a9742c957 100644 --- a/src/Orchard.Web/Themes/TheThemeMachine/Theme.txt +++ b/src/Orchard.Web/Themes/TheThemeMachine/Theme.txt @@ -4,4 +4,4 @@ Description: It's a *really* good theme, yo. Version: 0.1 Tags: Awesome Website: http://orchardproject.net -Zones: Header, Navigation, Featured, BeforeMain, Messages, BeforeContent, Content, AfterContent, AfterMain, TripelFirst, TripelSecond, TripelThird, FooterQuadFirst, FooterQuadSecond, FooterQuadThird, FooterQuadFourth, Footer, AsideFirst, AsideSecond \ No newline at end of file +Zones: Header, Navigation, Featured, BeforeMain, AsideFirst, Messages, BeforeContent, Content, AfterContent, AsideSecond, AfterMain, TripelFirst, TripelSecond, TripelThird, FooterQuadFirst, FooterQuadSecond, FooterQuadThird, FooterQuadFourth, Footer \ No newline at end of file From 1bab98300d49ff9181a0f17d95036c1d7ee9672f Mon Sep 17 00:00:00 2001 From: Sebastien Ros Date: Mon, 18 Oct 2010 12:49:08 -0700 Subject: [PATCH 4/5] Corrected Orchard.Email placement file --HG-- branch : dev --- src/Orchard.Web/Modules/Orchard.Email/Placement.info | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Orchard.Web/Modules/Orchard.Email/Placement.info b/src/Orchard.Web/Modules/Orchard.Email/Placement.info index e40e465f2..7f3cf4de5 100644 --- a/src/Orchard.Web/Modules/Orchard.Email/Placement.info +++ b/src/Orchard.Web/Modules/Orchard.Email/Placement.info @@ -1,3 +1,3 @@  - + From b262cb3ac092274ccde290d68d8914c600b8d698 Mon Sep 17 00:00:00 2001 From: Sebastien Ros Date: Mon, 18 Oct 2010 12:49:29 -0700 Subject: [PATCH 5/5] Migrating Core.Messaging --HG-- branch : dev --- .../Core/Messaging/Drivers/MessageSettingsPartDriver.cs | 8 ++++---- src/Orchard.Web/Core/Messaging/Migrations.cs | 3 ++- .../Core/Messaging/Models/MessageSettingsPart.cs | 5 ++++- .../Core/Messaging/Models/MessageSettingsPartRecord.cs | 4 ++++ src/Orchard.Web/Core/Messaging/Placement.info | 3 +++ ...ing.MessageSettings.cshtml => MessageSettings.cshtml} | 0 src/Orchard.Web/Core/Orchard.Core.csproj | 9 +++++++-- .../Modules/Orchard.Modules/Orchard.Modules.csproj | 2 +- 8 files changed, 25 insertions(+), 9 deletions(-) create mode 100644 src/Orchard.Web/Core/Messaging/Placement.info rename src/Orchard.Web/Core/Messaging/Views/EditorTemplates/Parts/{Messaging.MessageSettings.cshtml => MessageSettings.cshtml} (100%) diff --git a/src/Orchard.Web/Core/Messaging/Drivers/MessageSettingsPartDriver.cs b/src/Orchard.Web/Core/Messaging/Drivers/MessageSettingsPartDriver.cs index 0165185a5..9a12832ee 100644 --- a/src/Orchard.Web/Core/Messaging/Drivers/MessageSettingsPartDriver.cs +++ b/src/Orchard.Web/Core/Messaging/Drivers/MessageSettingsPartDriver.cs @@ -9,6 +9,7 @@ using Orchard.Messaging.Services; namespace Orchard.Core.Messaging.Drivers { [UsedImplicitly] public class MessageSettingsPartDriver : ContentPartDriver { + private const string TemplateName = "Parts/MessageSettings"; private readonly IMessageManager _messageQueueManager; public IOrchardServices Services { get; set; } @@ -29,7 +30,7 @@ namespace Orchard.Core.Messaging.Drivers { MessageSettings = part }; - return ContentPartTemplate(model, "Parts/Messaging.MessageSettings"); + return ContentShape("Parts_MessageSettings_Edit", () => shapeHelper.EditorTemplate(TemplateName: TemplateName, Model: model, Prefix: Prefix)); } protected override DriverResult Editor(MessageSettingsPart part, IUpdateModel updater, dynamic shapeHelper) { @@ -37,10 +38,9 @@ namespace Orchard.Core.Messaging.Drivers { MessageSettings = part }; - if (updater.TryUpdateModel(model, Prefix, null, null)) { - } + updater.TryUpdateModel(model, Prefix, null, null); - return ContentPartTemplate(model, "Parts/Messaging.MessageSettings"); + return ContentShape("Parts_MessageSettings_Edit", () => shapeHelper.EditorTemplate(TemplateName: TemplateName, Model: model, Prefix: Prefix)); } } } \ No newline at end of file diff --git a/src/Orchard.Web/Core/Messaging/Migrations.cs b/src/Orchard.Web/Core/Messaging/Migrations.cs index 375785c3e..92f112256 100644 --- a/src/Orchard.Web/Core/Messaging/Migrations.cs +++ b/src/Orchard.Web/Core/Messaging/Migrations.cs @@ -6,8 +6,9 @@ namespace Orchard.Core.Messaging { public int Create() { SchemaBuilder.CreateTable("MessageSettingsPartRecord", table => table .ContentPartRecord() - .Column("DefaultChannelService") + .Column("DefaultChannelService", c => c.WithLength(64)) ); + return 1; } } diff --git a/src/Orchard.Web/Core/Messaging/Models/MessageSettingsPart.cs b/src/Orchard.Web/Core/Messaging/Models/MessageSettingsPart.cs index c624bb20d..5b5303a1e 100644 --- a/src/Orchard.Web/Core/Messaging/Models/MessageSettingsPart.cs +++ b/src/Orchard.Web/Core/Messaging/Models/MessageSettingsPart.cs @@ -1,7 +1,10 @@ -using Orchard.ContentManagement; +using System.ComponentModel.DataAnnotations; +using Orchard.ContentManagement; namespace Orchard.Core.Messaging.Models { public class MessageSettingsPart : ContentPart { + + [StringLength(MessageSettingsPartRecord.DefaultChannelServiceLength)] public string DefaultChannelService { get { return Record.DefaultChannelService; } set { Record.DefaultChannelService = value; } diff --git a/src/Orchard.Web/Core/Messaging/Models/MessageSettingsPartRecord.cs b/src/Orchard.Web/Core/Messaging/Models/MessageSettingsPartRecord.cs index 7d23a9d03..74b16ca78 100644 --- a/src/Orchard.Web/Core/Messaging/Models/MessageSettingsPartRecord.cs +++ b/src/Orchard.Web/Core/Messaging/Models/MessageSettingsPartRecord.cs @@ -1,10 +1,14 @@ +using System.ComponentModel.DataAnnotations; using Orchard.ContentManagement.Records; namespace Orchard.Core.Messaging.Models { public class MessageSettingsPartRecord : ContentPartRecord { + public const ushort DefaultChannelServiceLength = 64; + /// /// Default service used for messages /// + [StringLength(DefaultChannelServiceLength)] public virtual string DefaultChannelService { get; set; } } diff --git a/src/Orchard.Web/Core/Messaging/Placement.info b/src/Orchard.Web/Core/Messaging/Placement.info new file mode 100644 index 000000000..35c14f610 --- /dev/null +++ b/src/Orchard.Web/Core/Messaging/Placement.info @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/src/Orchard.Web/Core/Messaging/Views/EditorTemplates/Parts/Messaging.MessageSettings.cshtml b/src/Orchard.Web/Core/Messaging/Views/EditorTemplates/Parts/MessageSettings.cshtml similarity index 100% rename from src/Orchard.Web/Core/Messaging/Views/EditorTemplates/Parts/Messaging.MessageSettings.cshtml rename to src/Orchard.Web/Core/Messaging/Views/EditorTemplates/Parts/MessageSettings.cshtml diff --git a/src/Orchard.Web/Core/Orchard.Core.csproj b/src/Orchard.Web/Core/Orchard.Core.csproj index a6827f9b7..a4a8010c7 100644 --- a/src/Orchard.Web/Core/Orchard.Core.csproj +++ b/src/Orchard.Web/Core/Orchard.Core.csproj @@ -268,7 +268,7 @@ - + @@ -384,7 +384,12 @@ - + + Designer + + + Designer + diff --git a/src/Orchard.Web/Modules/Orchard.Modules/Orchard.Modules.csproj b/src/Orchard.Web/Modules/Orchard.Modules/Orchard.Modules.csproj index 41709e58d..e256af8af 100644 --- a/src/Orchard.Web/Modules/Orchard.Modules/Orchard.Modules.csproj +++ b/src/Orchard.Web/Modules/Orchard.Modules/Orchard.Modules.csproj @@ -103,7 +103,7 @@ - +