Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
15 changes: 4 additions & 11 deletions assets/controllers/batch.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,6 @@ export default class extends Controller {
'identifierHolder',
];

static values = {
identifierHolderAttribute: {
type: String,
default: 'href',
}
}

#previousIdentifierMap = null;

connect() {
Expand Down Expand Up @@ -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') {
Expand All @@ -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;
}
Expand All @@ -118,7 +111,7 @@ export default class extends Controller {
}
}

identifierHolder.setAttribute(this.identifierHolderAttributeValue, url.toString());
identifierHolder.setAttribute('href', url.toString());
}

#updateIdentifierHolderDataParam(identifierHolder, identifierMap) {
Expand Down
2 changes: 1 addition & 1 deletion assets/controllers/bootstrap/modal.js
Original file line number Diff line number Diff line change
Expand Up @@ -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.');
Expand Down
3 changes: 1 addition & 2 deletions src/Resources/views/themes/bootstrap_5.html.twig
Original file line number Diff line number Diff line change
Expand Up @@ -826,11 +826,10 @@
<div
class="d-inline-block"
data-controller="kreyu--data-table-bundle--bootstrap-modal"
data-kreyu--data-table-bundle--bootstrap-modal-url-value="{{ href }}"
href="{{ href }}"

{% if batch %}
data-kreyu--data-table-bundle--batch-target="identifierHolder"
data-kreyu--data-table-bundle--batch-identifier-holder-attribute-value="data-kreyu--data-table-bundle--bootstrap-modal-url-value"
{% endif %}
>
{% set modalId = 'modalId-' ~ random() %}
Expand Down