From 7f1b7d892d96a6889094f87eba8de24835e30d25 Mon Sep 17 00:00:00 2001 From: Andrew Isherwood Date: Mon, 9 Apr 2018 15:04:35 +0100 Subject: [PATCH] Bug 20548: Remove copyright clearance for staff This patch removes the erroneously added workflow that requires staff users to agree to the copyright clearance declaration defined in the ILLModuleCopyrightClearance preference. Only OPAC users should be required to accept the declaration. 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) As an OPAC user make an ILL request: a) Navigate to a search results page in the catalog b) Click the "Make an Interlibrary Loan request" link at the bottom c) Choose "Create a new request", then select a backend d) Observe the text you added earlier is displayed with buttons for agreeing or disagreeing 5) As a staff user, select the "ILL requests" button on the front page of the intranet site a) Choose "Create a new request", then select a backend b) Observe that you are NOT prompted to agree to the text you added earlier Assigned-to: Andrew Isherwood --- Koha/Illrequest.pm | 33 +++++++++++----------- .../prog/en/modules/ill/ill-requests.tt | 14 +-------- opac/opac-illrequests.pl | 1 + 3 files changed, 19 insertions(+), 29 deletions(-) diff --git a/Koha/Illrequest.pm b/Koha/Illrequest.pm index 99b97bdbe4..cc61a870e5 100644 --- a/Koha/Illrequest.pm +++ b/Koha/Illrequest.pm @@ -600,23 +600,24 @@ sub backend_create { my ( $self, $params ) = @_; # Establish whether we need to do a generic copyright clearance. - if ( ( !$params->{stage} || $params->{stage} eq 'init' ) - && C4::Context->preference("ILLModuleCopyrightClearance") ) { - return { - error => 0, - status => '', - message => '', - method => 'create', - stage => 'copyrightclearance', - value => { - backend => $self->_backend->name - } - }; - } elsif ( defined $params->{stage} - && $params->{stage} eq 'copyrightclearance' ) { - $params->{stage} = 'init'; + if ($params->{opac}) { + if ( ( !$params->{stage} || $params->{stage} eq 'init' ) + && C4::Context->preference("ILLModuleCopyrightClearance") ) { + return { + error => 0, + status => '', + message => '', + method => 'create', + stage => 'copyrightclearance', + value => { + backend => $self->_backend->name + } + }; + } elsif ( defined $params->{stage} + && $params->{stage} eq 'copyrightclearance' ) { + $params->{stage} = 'init'; + } } - # First perform API action, then... my $args = { request => $self, diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt index aab9a75346..74f8c399a1 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt @@ -315,19 +315,7 @@ [% IF query_type == 'create' %]

New ILL request

- [% IF whole.stage == 'copyrightclearance' %] -
-

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

- Yes - No -
- [% ELSE %] - [% PROCESS $whole.template %] - [% END %] + [% PROCESS $whole.template %] [% ELSIF query_type == 'confirm' %]

Confirm ILL request

diff --git a/opac/opac-illrequests.pl b/opac/opac-illrequests.pl index 6f2b33cd14..83ae329a63 100755 --- a/opac/opac-illrequests.pl +++ b/opac/opac-illrequests.pl @@ -111,6 +111,7 @@ if ( $op eq 'list' ) { $params->{cardnumber} = Koha::Patrons->find({ borrowernumber => $loggedinuser })->cardnumber; + $params->{opac} = 1; my $backend_result = $request->backend_create($params); $template->param( media => [ "Book", "Article", "Journal" ], -- 2.11.0