From b12d5e7c20f44e12b990eaa2a083202bf8b5d43c Mon Sep 17 00:00:00 2001 From: Andrew Isherwood Date: Mon, 9 Apr 2018 14:32:21 +0100 Subject: [PATCH] Bug 20284: ILLModuleCopyrightClearance text breaks This patch fixes the display of the copyright notice text that is defined in ILLModuleCopyrightClearance preference when placing ILL requests from the OPAC. Handling of the copyrightclearance stage was missing, this has been added. To test: 1) Ensure you have at least one ILL backend available: https://wiki.koha-community.org/wiki/ILL_backends 2) Ensure you have the "ILLModule" preference enabled 3) Add some text to the "ILLModuleCopyrightClearance" preference 4) Navigate to a search results page in the catalog 5) Click the "Make an Interlibrary Loan request" link at the bottom 6) Choose "Create a new request", then select a backend 7) Observe the text you added earlier is displayed with buttons for agreeing or disagreeing (prior to this patch, this screen displayed an error) 8) Observe that clicking "Yes" takes you to the form for adding request details 9) Observe that clicking "No" takes you back to the "Interlibrary loan requests" page Signed-off-by: Barry Cannon Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jonathan Druart --- .../bootstrap/en/modules/opac-illrequests.tt | 47 ++++++++++++------- opac/opac-illrequests.pl | 24 ++++++---- 2 files changed, 46 insertions(+), 25 deletions(-) diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-illrequests.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-illrequests.tt index ae9b918290..08e21d6f2d 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-illrequests.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-illrequests.tt @@ -54,24 +54,37 @@
[% IF method == 'create' %]

New Interlibrary loan request

- [% INCLUDE messages %] - [% IF backends %] -
-
- - -
-
- - -
-
+ [% IF stage == 'copyrightclearance' %] + [% INCLUDE messages %] +
+

+ [% Koha.Preference('ILLModuleCopyrightClearance') %] +

+ Yes + No +
[% ELSE %] - [% PROCESS $whole.opac_template %] + [% INCLUDE messages %] + [% IF backends %] +
+
+ + +
+
+ + +
+
+ [% ELSE %] + [% PROCESS $whole.opac_template %] + [% END %] [% END %] [% ELSIF method == 'list' %]

Interlibrary loan requests

diff --git a/opac/opac-illrequests.pl b/opac/opac-illrequests.pl index 6f2b33cd14..976e1b71ad 100755 --- a/opac/opac-illrequests.pl +++ b/opac/opac-illrequests.pl @@ -112,15 +112,23 @@ if ( $op eq 'list' ) { borrowernumber => $loggedinuser })->cardnumber; my $backend_result = $request->backend_create($params); - $template->param( - media => [ "Book", "Article", "Journal" ], - branches => Koha::Libraries->search->unblessed, - whole => $backend_result, - request => $request - ); - if ($backend_result->{stage} eq 'commit') { - print $query->redirect('/cgi-bin/koha/opac-illrequests.pl?message=2'); + if ($backend_result->{stage} eq 'copyrightclearance') { + $template->param( + stage => $backend_result->{stage}, + whole => $backend_result + ); + } else { + $template->param( + media => [ "Book", "Article", "Journal" ], + branches => Koha::Libraries->search->unblessed, + whole => $backend_result, + request => $request + ); + if ($backend_result->{stage} eq 'commit') { + print $query->redirect('/cgi-bin/koha/opac-illrequests.pl?message=2'); + } } + } } -- 2.39.5