From d15bf55f3fa0d43f6f07a5b4e5541fd25a48af83 Mon Sep 17 00:00:00 2001 From: Andrew Isherwood Date: Thu, 3 Oct 2019 12:21:21 +0100 Subject: [PATCH] Bug 23681: Allow for changes to debarments The structure of debarments has changes slightly in that the displayed text is now a product of a call to Koha::RestrictionTypes rather than just the debarment's code. This patch allows for that Signed-off-by: Benjamin Veasey Sponsored-by: Loughborough University --- circ/circulation.pl | 2 ++ .../intranet-tmpl/prog/en/includes/borrower_debarments.inc | 12 ++---------- .../intranet-tmpl/prog/en/modules/members/memberentrygen.tt | 3 ++- members/memberentry.pl | 5 ++++- members/moremember.pl | 5 +++++ 5 files changed, 15 insertions(+), 12 deletions(-) diff --git a/circ/circulation.pl b/circ/circulation.pl index 5bc227d032..a900e9d8de 100755 --- a/circ/circulation.pl +++ b/circ/circulation.pl @@ -47,6 +47,7 @@ use Koha::AuthorisedValues; use Koha::CsvProfiles; use Koha::Patrons; use Koha::Patron::Debarments qw(GetDebarments); +use Koha::RestrictionTypes; use Koha::DateUtils; use Koha::Database; use Koha::BiblioFrameworks; @@ -638,6 +639,7 @@ $template->param( SpecifyDueDate => $duedatespec_allow, PatronAutoComplete => C4::Context->preference("PatronAutoComplete"), debarments => scalar GetDebarments({ borrowernumber => $borrowernumber }), + restriction_types => scalar Koha::RestrictionTypes->keyed_on_code(), todaysdate => output_pref( { dt => dt_from_string()->set(hour => 23)->set(minute => 59), dateformat => 'sql' } ), has_modifications => $has_modifications, override_high_holds => $override_high_holds, diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/borrower_debarments.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/borrower_debarments.inc index 8a0efadaa1..9dde40aa7d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/borrower_debarments.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/borrower_debarments.inc @@ -17,18 +17,10 @@ [% FOREACH d IN debarments %] + [% dtype = d.type %] - [% SWITCH d.type %] - [% CASE 'MANUAL' %] - Manual - [% CASE 'OVERDUES' %] - Overdues - [% CASE 'SUSPENSION' %] - Suspension - [% CASE 'DISCHARGE' %] - Discharge - [% END %] + [% restriction_types.$dtype.display_text | html %] [% IF d.comment.search('OVERDUES_PROCESS') %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt index f36d98314b..c650cd2ef2 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt @@ -1013,8 +1013,9 @@ [% FOREACH d IN debarments %] + [% dtype = d.type %] - [% d.type | html %] + [% restriction_types.$dtype.display_text | html %] [% IF d.comment.search('OVERDUES_PROCESS') %] Restriction added by overdues process [% d.comment.remove('OVERDUES_PROCESS ') | $raw %] diff --git a/members/memberentry.pl b/members/memberentry.pl index fa5cbe427e..3415bc50d9 100755 --- a/members/memberentry.pl +++ b/members/memberentry.pl @@ -39,6 +39,7 @@ use C4::Form::MessagingPreferences; use Koha::AuthUtils; use Koha::AuthorisedValues; use Koha::Patron::Debarments; +use Koha::RestrictionTypes; use Koha::Cities; use Koha::DateUtils; use Koha::Libraries; @@ -120,7 +121,9 @@ foreach my $id ( @delete_guarantor ) { ## Deal with debarments $template->param( - debarments => scalar GetDebarments( { borrowernumber => $borrowernumber } ) ); + debarments => scalar GetDebarments( { borrowernumber => $borrowernumber } ), + restriction_types => scalar Koha::RestrictionTypes->keyed_on_code() +); my @debarments_to_remove = $input->multi_param('remove_debarment'); foreach my $d ( @debarments_to_remove ) { DelDebarment( $d ); diff --git a/members/moremember.pl b/members/moremember.pl index a2ba396020..43292d127c 100755 --- a/members/moremember.pl +++ b/members/moremember.pl @@ -37,6 +37,7 @@ use C4::Form::MessagingPreferences; use List::MoreUtils qw/uniq/; use C4::Members::Attributes qw(GetBorrowerAttributes); use Koha::Patron::Debarments qw(GetDebarments); +use Koha::RestrictionTypes; use Koha::Patron::Messages; use Koha::DateUtils; use Koha::CsvProfiles; @@ -88,6 +89,10 @@ for (qw(gonenoaddress lost borrowernotes is_debarred)) { $patron->$_ and $template->param(flagged => 1) and last; } +$template->param( + restriction_types => scalar Koha::RestrictionTypes->keyed_on_code() +} + if ( $patron->is_debarred ) { $template->param( debarments => scalar GetDebarments({ borrowernumber => $borrowernumber }), -- 2.11.0