Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: redirect user to the intented page #5

Closed
wants to merge 1 commit into from
Closed
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
33 changes: 21 additions & 12 deletions decidim-core/app/packs/src/decidim/append_redirect_url_to_modals.js
Original file line number Diff line number Diff line change
Expand Up @@ -53,20 +53,29 @@ $(() => {
}

$(document).on("click.zf.trigger", (event) => {
const target = `#${$(event.target).data("open")}`;
const redirectUrl = $(event.target).data("redirectUrl");
// Try to get the <a> directly or find the closest parent <a>
let $target = $(event.target);
if (!$target.is('a')) {
$target = $target.closest('a'); // Find the closest parent <a> if the click is not directly on an <a>
}

// Check if an <a> was found
if ($target.length) {
const dialogTarget = `#${$target.data("dialog-open")}`;
const redirectUrl = $target.data("redirectUrl");

if (target && redirectUrl) {
$("<input type='hidden' />").
attr("id", "redirect_url").
attr("name", "redirect_url").
attr("value", redirectUrl).
appendTo(`${target} form`);
if (dialogTarget && redirectUrl) {
$("<input type='hidden' />")
.attr("id", "redirect_url")
.attr("name", "redirect_url")
.attr("value", redirectUrl)
.appendTo(`${dialogTarget} form`);

$(`${target} a`).attr("href", (index, href) => {
const querystring = jQuery.param({"redirect_url": redirectUrl});
return href + (href.match(/\?/) ? "&" : "?") + querystring;
});
$(`${dialogTarget} a`).attr("href", (index, href) => {
const querystring = jQuery.param({"redirect_url": redirectUrl});
return href + (href.match(/\?/) ? "&" : "?") + querystring;
});
}
}
});

Expand Down
Loading