From dbbb94117c2d6266cfc45a091b4b87012024f788 Mon Sep 17 00:00:00 2001 From: Raphael Kabo Date: Mon, 9 Oct 2023 17:24:09 +0100 Subject: [PATCH 1/2] Fix event token param bug --- views/event.handlebars | 4 +++- views/eventgroup.handlebars | 19 +++++++++++-------- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/views/event.handlebars b/views/event.handlebars index ae6674a..f4f1a2e 100755 --- a/views/event.handlebars +++ b/views/event.handlebars @@ -423,9 +423,9 @@ window.eventData = {{{ json jsonData }}}; $(this).closest(".comment").find(".replyContainer").slideToggle(); }) $(document).ready(function() { - // Save the editing token from the URL, if it is valid const eventID = $('#eventName').attr('data-event-id'); + const url = new URL(window.location.href); const urlParams = new URLSearchParams(window.location.search); if (urlParams.has('e')) { $.ajax({ @@ -463,6 +463,8 @@ window.eventData = {{{ json jsonData }}}; if (urlParams.has('show_edit')) { $('#editModal').modal('show'); + url.searchParams.delete('show_edit'); + history.replaceState(history.state, '', url.href); } // From https://davidwalsh.name/javascript-download diff --git a/views/eventgroup.handlebars b/views/eventgroup.handlebars index 0643ed6..1d3975a 100755 --- a/views/eventgroup.handlebars +++ b/views/eventgroup.handlebars @@ -229,29 +229,30 @@ window.groupData = {{{ json jsonData }}}; - \ No newline at end of file + + \ No newline at end of file diff --git a/views/partials/editeventmodal.handlebars b/views/partials/editeventmodal.handlebars index a36cd98..a9fe626 100644 --- a/views/partials/editeventmodal.handlebars +++ b/views/partials/editeventmodal.handlebars @@ -8,8 +8,15 @@