From c114d133fa26aacd1ab4a4d1c2b6c14772be2aa1 Mon Sep 17 00:00:00 2001 From: Andrew Isherwood Date: Mon, 9 Apr 2018 14:32:21 +0100 Subject: [PATCH] Bug [20284] - [ILL: Adding a 'new request' from ..] 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. Test plan: - Ensure you have at least one ILL backend available: https://wiki.koha-community.org/wiki/ILL_backends - Ensure you have the "ILLModule" preference enabled - Add some text to the "ILLModuleCopyrightClearance" preference - Navigate to a search results page in the catalog - Click the "Make an Interlibrary Loan request" link at the bottom - Choose "Create a new request", then select a backend - TEST: Check the text you added earlier is displayed with buttons for agreeing or disagreeing (prior to this patch, this screen displayed an error) - TEST: Check that clicking "Yes" takes you to the form for adding request details - TEST: Check that clicking "No" takes you back to the "Interlibrary loan requests" page --- .../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 4590284184..110898d2ba 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.11.0