From 508d97ed7d050c116b674adbbd5bd8797695174f Mon Sep 17 00:00:00 2001 From: Sebastien Ros Date: Thu, 1 Oct 2015 09:14:21 -0700 Subject: [PATCH] Fixing merge --- .../Modules/Orchard.Layouts/Drivers/LayoutPartDriver.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Orchard.Web/Modules/Orchard.Layouts/Drivers/LayoutPartDriver.cs b/src/Orchard.Web/Modules/Orchard.Layouts/Drivers/LayoutPartDriver.cs index 12fcd0d89..ace0e73fa 100644 --- a/src/Orchard.Web/Modules/Orchard.Layouts/Drivers/LayoutPartDriver.cs +++ b/src/Orchard.Web/Modules/Orchard.Layouts/Drivers/LayoutPartDriver.cs @@ -90,9 +90,10 @@ namespace Orchard.Layouts.Drivers { protected override DriverResult Editor(LayoutPart part, IUpdateModel updater, dynamic shapeHelper) { return ContentShape("Parts_Layout_Edit", () => { - if (part.Id == 0 && String.IsNullOrWhiteSpace(part.LayoutData)) { + var settings = part.TypePartDefinition.Settings.GetModel(); + // If the default layout setting is left empty, use the one from the service if (String.IsNullOrWhiteSpace(settings.DefaultLayoutData)) { var defaultData = _serializer.Serialize(_layoutManager.CreateDefaultLayout());