From d6703944c0e856df6e669e3231e807824bf34c3b Mon Sep 17 00:00:00 2001
From: Giuseppe Criscione <18699708+giuscris@users.noreply.github.com>
Date: Sat, 1 Mar 2025 18:41:41 +0100
Subject: [PATCH] Fix new page template filtering

---
 panel/src/ts/components/inputs/select-input.ts | 2 +-
 panel/src/ts/components/views/pages.ts         | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/panel/src/ts/components/inputs/select-input.ts b/panel/src/ts/components/inputs/select-input.ts
index 48fffb4c..1100096c 100644
--- a/panel/src/ts/components/inputs/select-input.ts
+++ b/panel/src/ts/components/inputs/select-input.ts
@@ -96,7 +96,7 @@ export class SelectInput {
             dropdown = document.createElement("div");
             dropdown.className = "dropdown-list";
 
-            dropdown.dataset.for = select.id;
+            dropdown.dataset.for = labelInput.id;
 
             const container = document.createElement("div");
             container.className = "dropdown-list-items";
diff --git a/panel/src/ts/components/views/pages.ts b/panel/src/ts/components/views/pages.ts
index 9cb6941c..d40adb40 100644
--- a/panel/src/ts/components/views/pages.ts
+++ b/panel/src/ts/components/views/pages.ts
@@ -120,7 +120,7 @@ export class Pages {
         }
 
         if (newPageModal) {
-            const parentSelect = $('[id="newPageModal.parent"]') as HTMLInputElement;
+            const parentSelect = $('[name="newPageModal[parent]"]') as HTMLInputElement;
 
             parentSelect.addEventListener("change", () => {
                 const option = $('.dropdown-list[data-for="newPageModal.parent"] .selected');
@@ -131,12 +131,12 @@ export class Pages {
 
                 const allowedTemplates = option.dataset.allowedTemplates ? option.dataset.allowedTemplates.split(" ") : [];
 
-                const pageTemplate = $('[id="newPageModal.template"]') as HTMLInputElement;
+                const pageTemplate = $('[name="newPageModal[template]"]') as HTMLInputElement;
 
                 if (allowedTemplates.length > 0) {
                     pageTemplate.dataset.previousValue = pageTemplate.value;
                     pageTemplate.value = allowedTemplates[0];
-                    ($('.form-select[data-for="newPageModal.template"]') as HTMLInputElement).value = ($(`.dropdown-list[data-for="newPageModal.template"] .dropdown-item[data-value="${pageTemplate.value}"]`) as HTMLElement).innerText;
+                    ($('.form-select[id="newPageModal.template"]') as HTMLInputElement).value = ($(`.dropdown-list[data-for="newPageModal.template"] .dropdown-item[data-value="${pageTemplate.value}"]`) as HTMLElement).innerText;
 
                     $$('.dropdown-list[data-for="newPageModal.template"] .dropdown-item').forEach((option) => {
                         if (!allowedTemplates.includes(option.dataset.value as string)) {
@@ -147,7 +147,7 @@ export class Pages {
                     if ("previousValue" in pageTemplate.dataset) {
                         pageTemplate.value = pageTemplate.dataset.previousValue as string;
                         delete pageTemplate.dataset.previousValue;
-                        ($('.form-select[data-for="newPageModal.template"]') as HTMLInputElement).value = ($(`.dropdown-list[data-for="newPageModal.template"] .dropdown-item[data-value="${pageTemplate.value}"]`) as HTMLElement).innerText;
+                        ($('.form-select[id="newPageModal.template"]') as HTMLInputElement).value = ($(`.dropdown-list[data-for="newPageModal.template"] .dropdown-item[data-value="${pageTemplate.value}"]`) as HTMLElement).innerText;
                     }
 
                     $$('.dropdown-list[data-for="newPageModal.template"] .dropdown-item').forEach((option) => {