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

Fixing merge

Browse Source
This commit is contained in:
Sebastien Ros
2015-10-01 09:14:21 -07:00
parent d0b364c28e
commit 508d97ed7d
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Orchard.Web/Modules/Orchard.Layouts/Drivers/LayoutPartDriver.cs
View File

@@ -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<LayoutTypePartSettings>();
// 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());