yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add missing ForceLeft and ForceRight (#13190)

Browse Source
This commit is contained in:
Mole
2022-10-13 08:24:50 +02:00
committed by Zeegaan
parent 6e7ecd0a77
commit 213dd7114d
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Umbraco.Infrastructure/Models/Blocks/BlockGridLayoutItem.cs
View File

@@ -25,6 +25,12 @@ public class BlockGridLayoutItem : IBlockLayoutItem
[JsonProperty("rowSpan", NullValueHandling = NullValueHandling.Ignore)]
public int? RowSpan { get; set; }
[JsonProperty("forceLeft")]
public bool ForceLeft { get; set; }
[JsonProperty("forceRight")]
public bool ForceRight { get; set; }
[JsonProperty("areas", NullValueHandling = NullValueHandling.Ignore)]
public BlockGridLayoutAreaItem[] Areas { get; set; } = Array.Empty<BlockGridLayoutAreaItem>();
}

2
src/Umbraco.Infrastructure/PropertyEditors/ValueConverters/BlockGridPropertyValueConverter.cs
View File

@@ -49,6 +49,8 @@ namespace Umbraco.Cms.Core.PropertyEditors.ValueConverters
blockItem.RowSpan = layoutItem.RowSpan!.Value;
blockItem.ColumnSpan = layoutItem.ColumnSpan!.Value;
blockItem.ForceLeft = layoutItem.ForceLeft;
blockItem.ForceRight = layoutItem.ForceRight;
blockItem.AreaGridColumns = blockConfig.AreaGridColumns;
blockItem.GridColumns = configuration.GridColumns;
blockItem.Areas = layoutItem.Areas.Select(area =>