Skip to content

V10: Fix missing ForceLeft and ForceRight in BlockGrid #13190

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Zeegaan merged 1 commit into from
Oct 13, 2022
Merged

V10: Fix missing ForceLeft and ForceRight in BlockGrid #13190

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions src/Umbraco.Infrastructure/Models/Blocks/BlockGridLayoutItem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 changes: 2 additions & 0 deletions ...Umbraco.Infrastructure/PropertyEditors/ValueConverters/BlockGridPropertyValueConverter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,8 @@ public override bool IsConverter(IPublishedPropertyType propertyType)

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 =>
Expand Down