From d3b9b980f3192533449177346e23112000a9f46d Mon Sep 17 00:00:00 2001 From: Pedro Amorim Date: Wed, 3 Jan 2024 12:01:36 +0000 Subject: [PATCH] Bug 35685: Fix after creation actions Test plan: 1) Install FreeForm and enable ILLModule, run: bash <(curl -s https://raw.githubusercontent.com/ammopt/koha-ill-dev/master/start-ill-dev.sh) 2) Configure ILLModuleDisclaimerByType, visit: /cgi-bin/koha/admin/preferences.pl?tab=&op=search&searchfield=ILLModuleDisclaimerByType Click "edit" and paste the example code into the sys pref value 3) Create a new OPAC ILL request, visit: /cgi-bin/koha/opac-illrequests.pl?method=create&backend=FreeForm 4) Dont put a type or branch, click 'Create', on the next screen click 'Submit' 5) Notice it explodes 6) Apply patch and repeat. It no longer explodes and now shows an error message. Signed-off-by: David Nind --- opac/opac-illrequests.pl | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/opac/opac-illrequests.pl b/opac/opac-illrequests.pl index 5173b8da6c..935aa38e5e 100755 --- a/opac/opac-illrequests.pl +++ b/opac/opac-illrequests.pl @@ -150,13 +150,6 @@ if ( $op eq 'list' ) { $params->{opac} = 1; my $backend_result = $request->backend_create($params); - # After creation actions - if ( $params->{type_disclaimer_submitted} ) { - $type_disclaimer->after_request_created( $params, $request ); - print $query->redirect('/cgi-bin/koha/opac-illrequests.pl?message=2'); - exit; - } - if ($backend_result->{stage} eq 'copyrightclearance') { $template->param( stage => $backend_result->{stage}, @@ -171,6 +164,14 @@ if ( $op eq 'list' ) { ); if ($backend_result->{stage} eq 'commit') { print $query->redirect('/cgi-bin/koha/opac-illrequests.pl?message=2'); + + # After creation actions + if ( $params->{type_disclaimer_submitted} ) { + $type_disclaimer->after_request_created( $params, $request ); + print $query->redirect('/cgi-bin/koha/opac-illrequests.pl?message=2'); + exit; + } + exit; } } -- 2.30.2