From 998de6f7778349c2525fa7a070cb625d678225bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Maci=C4=85g?= Date: Tue, 15 Jul 2025 18:24:28 +0200 Subject: [PATCH] Fix batch modal action --- assets/controllers/batch.js | 15 ++++----------- assets/controllers/bootstrap/modal.js | 2 +- src/Resources/views/themes/bootstrap_5.html.twig | 3 +-- 3 files changed, 6 insertions(+), 14 deletions(-) diff --git a/assets/controllers/batch.js b/assets/controllers/batch.js index 17e186db..30b13590 100755 --- a/assets/controllers/batch.js +++ b/assets/controllers/batch.js @@ -10,13 +10,6 @@ export default class extends Controller { 'identifierHolder', ]; - static values = { - identifierHolderAttribute: { - type: String, - default: 'href', - } - } - #previousIdentifierMap = null; connect() { @@ -84,7 +77,7 @@ export default class extends Controller { } for (const identifierHolder of this.identifierHolderTargets) { - this.#updateIdentifierHolderAttribute(identifierHolder, identifierMap); + this.#updateIdentifierHolderHrefAttribute(identifierHolder, identifierMap); this.#updateIdentifierHolderDataParam(identifierHolder, identifierMap); if (identifierHolder.tagName === 'FORM') { @@ -95,11 +88,11 @@ export default class extends Controller { this.#previousIdentifierMap = identifierMap; } - #updateIdentifierHolderAttribute(identifierHolder, identifierMap) { + #updateIdentifierHolderHrefAttribute(identifierHolder, identifierMap) { let url; try { - url = new URL(identifierHolder.getAttribute(this.identifierHolderAttributeValue), window.location.origin); + url = new URL(identifierHolder.getAttribute('href'), window.location.origin); } catch (exception) { return; } @@ -118,7 +111,7 @@ export default class extends Controller { } } - identifierHolder.setAttribute(this.identifierHolderAttributeValue, url.toString()); + identifierHolder.setAttribute('href', url.toString()); } #updateIdentifierHolderDataParam(identifierHolder, identifierMap) { diff --git a/assets/controllers/bootstrap/modal.js b/assets/controllers/bootstrap/modal.js index 54185de8..cc54a286 100644 --- a/assets/controllers/bootstrap/modal.js +++ b/assets/controllers/bootstrap/modal.js @@ -13,7 +13,7 @@ export default class extends Controller { event.preventDefault(); const modalContent = this.modalTarget; - fetch(this.urlValue) + fetch(this.element.getAttribute('href')) .then(response => { if (!response.ok) { throw new Error('Error loading content.'); diff --git a/src/Resources/views/themes/bootstrap_5.html.twig b/src/Resources/views/themes/bootstrap_5.html.twig index 59b64b0a..3053df9c 100755 --- a/src/Resources/views/themes/bootstrap_5.html.twig +++ b/src/Resources/views/themes/bootstrap_5.html.twig @@ -830,11 +830,10 @@
{% set modalId = 'modalId-' ~ random() %}