From 30b1f2ab5ccbd2f9d502722ff4c3dfaa908812c9 Mon Sep 17 00:00:00 2001
From: Denis-RZ <77514212+Denis-RZ@users.noreply.github.com>
Date: Wed, 18 Jun 2025 16:48:15 +0800
Subject: [PATCH] Fix dropdown selections in block templates

---
 .../MyWebApp/Views/AdminBlockTemplate/AddToPage.cshtml | 10 +++++-----
 .../Views/AdminBlockTemplate/_PageAssignment.cshtml    | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/website/MyWebApp/Views/AdminBlockTemplate/AddToPage.cshtml b/website/MyWebApp/Views/AdminBlockTemplate/AddToPage.cshtml
index 55180b3..a7a0231 100644
--- a/website/MyWebApp/Views/AdminBlockTemplate/AddToPage.cshtml
+++ b/website/MyWebApp/Views/AdminBlockTemplate/AddToPage.cshtml
@@ -18,10 +18,10 @@
     <div>
         <label>Assign To Pages</label>
         <select id="page-select" name="pageIds" multiple size="5">
-            <option value="0" selected="@(selectedPages.Contains(0))">All Pages</option>
+            <option value="0" selected="@(selectedPages.Contains(0) ? "selected" : null)">All Pages</option>
             @foreach (var p in ViewBag.Pages as List<Page>)
             {
-                <option value="@p.Id" selected="@(selectedPages.Contains(p.Id))">@p.Slug</option>
+                <option value="@p.Id" selected="@(selectedPages.Contains(p.Id) ? "selected" : null)">@p.Slug</option>
             }
         </select>
     </div>
@@ -30,7 +30,7 @@
         <select id="zone-select" name="zone">
             @foreach (var z in ViewBag.Zones as List<string>)
             {
-                <option value="@z" selected="@(selectedZone == z)">@z</option>
+                <option value="@z" selected="@(selectedZone == z ? "selected" : null)">@z</option>
             }
         </select>
     </div>
@@ -38,10 +38,10 @@
         <label>Role</label>
 
         <select name="role">
-            <option value="" selected="@(string.IsNullOrEmpty(selectedRole))">(none)</option>
+            <option value="" selected="@(string.IsNullOrEmpty(selectedRole) ? "selected" : null)">(none)</option>
             @foreach (var r in ViewBag.Roles as List<Role>)
             {
-                <option value="@r.Name" selected="@(selectedRole == r.Name)">@r.Name</option>
+                <option value="@r.Name" selected="@(selectedRole == r.Name ? "selected" : null)">@r.Name</option>
             }
 
         </select>
diff --git a/website/MyWebApp/Views/AdminBlockTemplate/_PageAssignment.cshtml b/website/MyWebApp/Views/AdminBlockTemplate/_PageAssignment.cshtml
index 6e6c408..e2a40f5 100644
--- a/website/MyWebApp/Views/AdminBlockTemplate/_PageAssignment.cshtml
+++ b/website/MyWebApp/Views/AdminBlockTemplate/_PageAssignment.cshtml
@@ -10,10 +10,10 @@
         <label>Pages</label>
         <input type="text" id="page-display" readonly />
         <select id="page-select" name="pageIds" multiple size="5">
-            <option value="0" selected="@(selectedPages.Contains(0))">All Pages</option>
+            <option value="0" selected="@(selectedPages.Contains(0) ? "selected" : null)">All Pages</option>
             @foreach (var p in ViewBag.Pages as List<Page>)
             {
-                <option value="@p.Id" selected="@(selectedPages.Contains(p.Id))">@p.Slug</option>
+                <option value="@p.Id" selected="@(selectedPages.Contains(p.Id) ? "selected" : null)">@p.Slug</option>
             }
         </select>
     </div>
@@ -22,17 +22,17 @@
         <select id="zone-select" name="zone">
             @foreach (var z in ViewBag.Zones as List<string>)
             {
-                <option value="@z" selected="@(selectedZone == z)">@z</option>
+                <option value="@z" selected="@(selectedZone == z ? "selected" : null)">@z</option>
             }
         </select>
     </div>
     <div>
         <label>Role</label>
         <select name="role">
-            <option value="" selected="@(string.IsNullOrEmpty(selectedRole))">(none)</option>
+            <option value="" selected="@(string.IsNullOrEmpty(selectedRole) ? "selected" : null)">(none)</option>
             @foreach (var r in ViewBag.Roles as List<Role>)
             {
-                <option value="@r.Name" selected="@(selectedRole == r.Name)">@r.Name</option>
+                <option value="@r.Name" selected="@(selectedRole == r.Name ? "selected" : null)">@r.Name</option>
             }
         </select>
     </div>