From 702dcb875ec3c6fc126b86cc175249c3a9ad08bf Mon Sep 17 00:00:00 2001 From: Aleisha Date: Tue, 23 Feb 2016 04:06:30 +0000 Subject: [PATCH] Bug 15823: Can still access patron discharge slip without having the syspref on MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit EDIT: Fix for OPAC side To test: 1) Ensure syspref useDischarge is disabled 2) Go to /cgi-bin/koha/members/discharge.pl?borrowernumber=X&discharge=1 3) Validate that you are still able to generate a discharge slip for this patron 4) Apply patch and refresh page 5) Confirm that you are redirected to the circulation.pl page for the user and that an error message is there. OPAC SIDE 6) Go to the OPAC 7) Go to /cgi-bin/koha/opac-discharge.pl 8) Confirm you get a message saying discharges are disabled 9) Go to /cgi-bin/koha/opac-discharge.pl?op=request 10) Confirm you see same message Sponsored-by: Catalyst IT Followed test plan, works as expected. Signed-off-by: Marc VĂ©ron --- circ/circulation.pl | 1 + koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt | 5 ++++- koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-discharge.tt | 4 ++++ members/discharge.pl | 11 +++++++++-- 4 files changed, 18 insertions(+), 3 deletions(-) diff --git a/circ/circulation.pl b/circ/circulation.pl index 3a57685..1fcb402 100755 --- a/circ/circulation.pl +++ b/circ/circulation.pl @@ -660,6 +660,7 @@ $template->param( canned_bor_notes_loop => $canned_notes, debarments => GetDebarments({ borrowernumber => $borrowernumber }), todaysdate => output_pref( { dt => dt_from_string()->set(hour => 23)->set(minute => 59), dateformat => 'sql' } ), + nopermission => $query->param('nopermission'), ); output_html_with_http_headers $query, $cookie, $template->output; diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt index ec3a1d9..ebb4aaf 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt @@ -122,7 +122,6 @@ $(document).ready(function() { $(':radio', this).attr('checked', 'true') } }); - }); //]]> @@ -212,6 +211,10 @@ $(document).ready(function() {
The patron has unpaid charges for holds, rentals etc of [% alert.OTHER_CHARGES %]
[% END %] +[% IF ( nopermission ) %] +
Staff members are not allowed to discharge borrowers, nor borrowers to request a discharge.
+[% END %] + [% IF ( NEEDSCONFIRMATION ) %]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-discharge.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-discharge.tt index d8f5648..23f088d 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-discharge.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-discharge.tt @@ -23,6 +23,9 @@

Discharge

+ [% IF not(Koha.Preference("useDischarge")) %] + Discharges have not been enabled. Please contact the library. + [% ELSE %] [% FOR message IN messages %]
[% IF message.code == "unable_to_generate_pdf" %] @@ -46,6 +49,7 @@

Warning: This request is only valid if you are in good standing with the library. Once the application is made, you can not borrow library materials.

Ask for a discharge [% END %] + [% END %]
diff --git a/members/discharge.pl b/members/discharge.pl index c9062dc..0fc9e8e 100755 --- a/members/discharge.pl +++ b/members/discharge.pl @@ -42,6 +42,7 @@ use Koha::Patron::Images; use Koha::DateUtils; my $input = new CGI; + my ( $template, $loggedinuser, $cookie, $flags ) = get_template_and_user({ template_name => 'members/discharge.tt', query => $input, @@ -50,7 +51,13 @@ my ( $template, $loggedinuser, $cookie, $flags ) = get_template_and_user({ flagsrequired => { 'borrowers' => '*' }, }); -my $borrowernumber; +my $borrowernumber = $input->param('borrowernumber'); + +unless ( C4::Context->preference('useDischarge') ) { + print $input->redirect("/cgi-bin/koha/circ/circulation.pl?borrowernumber=$borrowernumber&nopermission=1"); + exit; +} else { + my $data; if ( $input->param('borrowernumber') ) { $borrowernumber = $input->param('borrowernumber'); @@ -132,7 +139,7 @@ if ( $input->param('borrowernumber') ) { can_be_discharged => $can_be_discharged, validated_discharges => $validated_discharges, ); -} +}} $template->param( dischargeview => 1, ); -- 1.7.10.4