From fb120de216898c18dd24cef37fa04b15eb117c47 Mon Sep 17 00:00:00 2001 From: Lucas Gass Date: Mon, 29 Aug 2022 21:48:01 +0000 Subject: [PATCH] Bug 31486: Redirect to proper page after message deletion To test: 1. Go to a patron account and create some messages 2. Try deleting some from both the patron details page and the patron checkout page. 3. Notice that is you are on the patron checkout page and delete a message you are then redirected to the patron details page. 4. Apply patch 5. Try deleting messages from both pages and confirm you are redirected back to that same page and the message is properly deleted. Signed-off-by: Andrew Fuerste-Henry Signed-off-by: Katrin Fischer --- koha-tmpl/intranet-tmpl/prog/en/includes/patron_messages.inc | 4 ++++ koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patron_messages.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patron_messages.inc index cb99f267e7..7d629a5534 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron_messages.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron_messages.inc @@ -310,7 +310,11 @@ "[% patron_message.message | html %]" [% IF patron_message.branchcode == Branches.GetLoggedInBranchcode OR Koha.Preference('AllowAllMessageDeletion') %] + [% IF moremember %] Delete + [% ELSE %] + Delete + [% END %] [% END %] [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt index 2dda38be50..ac4ad7e375 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt @@ -92,7 +92,7 @@ [% END %]
- [% INCLUDE 'patron_messages.inc' %] + [% INCLUDE 'patron_messages.inc' moremember = 1 %]

[% INCLUDE 'patron-title.inc' no_html = 1 %]

-- 2.30.2