From 3763a88c671ca54ecbe6cfab92057af33ac1b31e Mon Sep 17 00:00:00 2001
From: Antonin Delpeuch <antonin@delpeuch.eu>
Date: Wed, 1 Apr 2026 04:23:13 +0200
Subject: [PATCH] fix: allow modals to be submitted multiple times (#11843)

Fixes #11842.

The `once: true` was likely added to prevent multiple concurrent
submissions of the same form. This could still be worth preventing,
but I suspect it would require wrapping the supplied `onApprove`
callback with the corresponding logic, implemented manually, as I
am not aware of any native API to prevent concurrent executions of
callbacks.

Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/11843
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
Co-authored-by: Antonin Delpeuch <antonin@delpeuch.eu>
Co-committed-by: Antonin Delpeuch <antonin@delpeuch.eu>
---
 tests/e2e/repo-labels.test.e2e.ts | 20 ++++++++++++++++++++
 web_src/js/modules/modal.ts       |  2 +-
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/tests/e2e/repo-labels.test.e2e.ts b/tests/e2e/repo-labels.test.e2e.ts
index ef33e91dda..956c4c19d5 100644
--- a/tests/e2e/repo-labels.test.e2e.ts
+++ b/tests/e2e/repo-labels.test.e2e.ts
@@ -41,3 +41,23 @@ test('Edit label', async ({page}) => {
 
   await expect(page.locator('.label-title').filter({hasText: labelName})).toBeVisible();
 });
+
+test('New label after a failed validation', async ({page}) => {
+  // for issue https://codeberg.org/forgejo/forgejo/issues/11842
+  const response = await page.goto('/user2/repo1/labels');
+  expect(response?.status()).toBe(200);
+
+  await page.getByRole('button', {name: 'New label'}).click();
+  await expect(page.locator('#new-label-modal')).toBeVisible();
+
+  // attempt to submit the form without having filled it first
+  await page.getByRole('button', {name: 'Create label'}).click();
+  await screenshot(page, page.locator('#new-label-modal'));
+
+  // then fill the form and submit it again
+  const labelName = dynamic_id();
+  await page.getByRole('textbox', {name: 'Label name'}).fill(labelName);
+  await page.getByRole('button', {name: 'Create label'}).click();
+
+  await expect(page.locator('.label-title').filter({hasText: labelName})).toBeVisible();
+});
diff --git a/web_src/js/modules/modal.ts b/web_src/js/modules/modal.ts
index 290dccee70..b6fef12b2b 100644
--- a/web_src/js/modules/modal.ts
+++ b/web_src/js/modules/modal.ts
@@ -13,7 +13,7 @@ export function showModal(modalID: string, onApprove: () => void) {
   modal.querySelector('.cancel')?.addEventListener('click', () => {
     modal.close();
   }, {once: true, passive: true});
-  modal.querySelector('.ok')?.addEventListener('click', onApprove, {once: true, passive: true});
+  modal.querySelector('.ok')?.addEventListener('click', onApprove, {passive: true});
 
   // The modal is ready to be shown.
   modal.showModal();