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

#20957 : ContentTypeDefinitionBuilder Placement extension method throws away some of your placements.

Browse Source 
Work Item: 20957
This commit is contained in:
Matt Varblow
2015-02-14 16:40:08 +00:00
committed by agriffard
parent 970d0274a6
commit d72ce5a522
1 changed files with 16 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/Orchard.Web/Modules/Orchard.ContentTypes/Extensions/MetadataExtensions.cs
View File

@@ -33,31 +33,24 @@ namespace Orchard.ContentTypes.Extensions {
return builder.WithSetting("ContentTypeSettings.Placement." + placementType, String.Empty);
}
/// <summary>
/// Defines a custom placement
/// </summary>
public static ContentTypeDefinitionBuilder Placement(this ContentTypeDefinitionBuilder builder, PlacementType placementType, string shapeType, string differentiator, string zone, string position) {
var serializer = new JavaScriptSerializer();
var placementSettings = GetPlacement(builder.Build(), placementType).ToList();
placementSettings = placementSettings.Where(x => x.ShapeType != shapeType && x.Differentiator != differentiator).ToList();
placementSettings.Add(new PlacementSettings {
ShapeType = shapeType,
Differentiator = differentiator,
Zone = zone,
Position = position
});
var placement = serializer.Serialize(placementSettings.ToArray());
/// <summary>
/// Defines a custom placement
/// </summary>
public static ContentTypeDefinitionBuilder Placement(this ContentTypeDefinitionBuilder builder, PlacementType placementType, string shapeType, string differentiator, string zone, string position) {
var placement = AddPlacement(builder.Build(), placementType, shapeType, differentiator, zone, position);
return builder.WithSetting("ContentTypeSettings.Placement." + placementType, placement);
}
/// <summary>
/// Adds a placement the string representation of a placement
/// </summary>
public static ContentTypeDefinition Placement(this ContentTypeDefinition builder, PlacementType placementType, string shapeType, string differentiator, string zone, string position) {
/// <summary>
/// Adds a placement the string representation of a placement
/// </summary>
public static ContentTypeDefinition Placement(this ContentTypeDefinition builder, PlacementType placementType, string shapeType, string differentiator, string zone, string position) {
var placement = AddPlacement(builder, placementType, shapeType, differentiator, zone, position);
builder.Settings["ContentTypeSettings.Placement." + placementType] = placement;
return builder;
}
private static string AddPlacement(ContentTypeDefinition builder, PlacementType placementType, string shapeType, string differentiator, string zone, string position) {
var serializer = new JavaScriptSerializer();
var placementSettings = GetPlacement(builder, placementType).ToList();
@@ -71,10 +64,8 @@ namespace Orchard.ContentTypes.Extensions {
});
var placement = serializer.Serialize(placementSettings.ToArray());
builder.Settings["ContentTypeSettings.Placement." + placementType] = placement;
return builder;
return placement;
}
/// <summary>
/// Adds a placement the string representation of a placement
/// </summary>
@@ -91,8 +82,6 @@ namespace Orchard.ContentTypes.Extensions {
currentSettings.TryGetValue("ContentTypeSettings.Placement." + placementType, out placement);
return String.IsNullOrEmpty(placement) ? new PlacementSettings[0] : serializer.Deserialize<PlacementSettings[]>(placement);
}
}
}