Skip to content

Implement zone dropdowns for block templates #125

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
Denis-RZ merged 1 commit into from
Jun 18, 2025
Merged

Implement zone dropdowns for block templates #125

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
21 changes: 13 additions & 8 deletions website/MyWebApp/Controllers/AdminBlockTemplateController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,11 @@ private async Task LoadPagesAsync()
{
ViewBag.Pages = await _db.Pages.AsNoTracking().OrderBy(p => p.Slug).ToListAsync();
ViewBag.Roles = await _db.Roles.AsNoTracking().OrderBy(r => r.Name).ToListAsync();
ViewBag.Zones = await _db.PageSections.AsNoTracking()
.Select(s => s.Zone)
.Distinct()
.OrderBy(z => z)
.ToListAsync();
}

public async Task<IActionResult> Index()
Expand Down Expand Up @@ -202,11 +207,11 @@ public async Task<IActionResult> AddToPage(int id, List<int> pageIds, string zon
}
foreach (var pageId in pageIds)
{
var sort = await _db.PageSections
var maxSort = await _db.PageSections
.Where(s => s.PageId == pageId && s.Zone == zone)
.Select(s => s.SortOrder)
.DefaultIfEmpty(-1)
.MaxAsync() + 1;
.Select(s => (int?)s.SortOrder)
.MaxAsync();
var sort = (maxSort ?? -1) + 1;
var section = new PageSection
{
PageId = pageId,
Expand Down Expand Up @@ -235,11 +240,11 @@ private async Task AddSectionsAsync(BlockTemplate template, List<int>? pageIds,
}
foreach (var pageId in pageIds)
{
var sort = await _db.PageSections
var maxSort = await _db.PageSections
.Where(s => s.PageId == pageId && s.Zone == zone)
.Select(s => s.SortOrder)
.DefaultIfEmpty(-1)
.MaxAsync() + 1;
.Select(s => (int?)s.SortOrder)
.MaxAsync();
var sort = (maxSort ?? -1) + 1;
var section = new PageSection
{
PageId = pageId,
Expand Down
7 changes: 6 additions & 1 deletion website/MyWebApp/Views/AdminBlockTemplate/AddToPage.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,12 @@
</div>
<div>
<label>Zone</label>
<input type="text" name="zone" />
<select id="zone-select" name="zone">
@foreach (var z in ViewBag.Zones as List<string>)
{
<option value="@z">@z</option>
}
</select>
</div>
<div>
<label>Role</label>
Expand Down
7 changes: 6 additions & 1 deletion website/MyWebApp/Views/AdminBlockTemplate/_PageAssignment.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<input type="text" id="page-display" readonly />
<select id="page-select" name="pageIds" multiple size="5">
<option value="0">All Pages</option>
@foreach (var p in ViewBag.Pages as List<Page>)

Check warning on line 9 in website/MyWebApp/Views/AdminBlockTemplate/_PageAssignment.cshtml

View workflow job for this annotation

GitHub Actions / build 

Dereference of a possibly null reference.

Check warning on line 9 in website/MyWebApp/Views/AdminBlockTemplate/_PageAssignment.cshtml

View workflow job for this annotation

GitHub Actions / build 

Dereference of a possibly null reference.
{
<option value="@p.Id">@p.Slug</option>
}
Expand All @@ -14,7 +14,12 @@
</div>
<div>
<label>Zone</label>
<input type="text" name="zone" />
<select id="zone-select" name="zone">
@foreach (var z in ViewBag.Zones as List<string>)
{
<option value="@z">@z</option>
}
</select>
</div>
<div>
<label>Role</label>
Expand Down
Loading