From d71aefd0ac9c147694adfef655abd537365dc64b Mon Sep 17 00:00:00 2001 From: Pedro Amorim Date: Tue, 9 Jan 2024 09:56:35 +0000 Subject: [PATCH] Bug 35570: (QA follow-up): Fix action button links. Use url filter instead of uri. Before applying this patch: 1) Click 'Manage Request' for a request, then on the top toolbar click 'Confirm request'. 2) Click the 'Confirm request' button on the bottom of the text. Notice it fails with a 404. Use the browser to go back. 3) Click the 'Cancel' button on the bottom of the text. Notice it fails with a 404. Use the browser to go back. 4) Set all the requests to status to 'REQ' (relevant for next test), ktd kshell, run: echo 'update illrequests set status = 'REQ';' | koha-mysql kohadev 5) Click 'Manage Request' for a request, then on the top toolbar click 'Revert request'. 6) Click the 'Revert request' button on the bottom of the text. Notice it fails with a 404. Use the browser to go back. 7) Click the 'Cancel' button on the bottom of the text. Notice it fails with a 404. Use the browser to go back. 8) Apply patch. Repeat test plan. Notice all the action buttons now work. --- Koha/ILL/Backend/intra-includes/cancel.inc | 4 ++-- Koha/ILL/Backend/intra-includes/confirm.inc | 4 ++-- Koha/ILL/Backend/intra-includes/create.inc | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Koha/ILL/Backend/intra-includes/cancel.inc b/Koha/ILL/Backend/intra-includes/cancel.inc index 51dd40c325..99301ffbf4 100644 --- a/Koha/ILL/Backend/intra-includes/cancel.inc +++ b/Koha/ILL/Backend/intra-includes/cancel.inc @@ -10,7 +10,7 @@

[% base_url = "/cgi-bin/koha/ill/ill-requests.pl" %] [% proceed_url = base_url _ "?method=cancel&stage=confirm" _ "&illrequest_id=" _ request.illrequest_id %] - Revert request - Cancel + Revert request + Cancel

[% END %] diff --git a/Koha/ILL/Backend/intra-includes/confirm.inc b/Koha/ILL/Backend/intra-includes/confirm.inc index ad9646f305..099c5d6a67 100644 --- a/Koha/ILL/Backend/intra-includes/confirm.inc +++ b/Koha/ILL/Backend/intra-includes/confirm.inc @@ -10,8 +10,8 @@

[% base_url = "/cgi-bin/koha/ill/ill-requests.pl" %] [% proceed_url = base_url _ "?method=confirm&stage=confirm" _ "&illrequest_id=" _ request.illrequest_id %] - Confirm request - Cancel + Confirm request + Cancel

[% ELSE %]

Unknown stage. This should not have happened. diff --git a/Koha/ILL/Backend/intra-includes/create.inc b/Koha/ILL/Backend/intra-includes/create.inc index dda14a57f8..ef8d95590c 100644 --- a/Koha/ILL/Backend/intra-includes/create.inc +++ b/Koha/ILL/Backend/intra-includes/create.inc @@ -208,7 +208,7 @@

- Cancel + Cancel
-- 2.30.2