gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug 37360: (follow-up) added bool type to modborrowers 

This follow-up patch adds a bool type to modborrowers, so that the
options can be translated within the template files.

Signed-off-by: Brendan Lawlor <blawlor@clamsnet.org>

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
This commit is contained in:
Jake Deery 2024-10-04 11:35:40 +00:00 committed by Katrin Fischer
parent ea156c99b8
commit 59563159be
No known key found for this signature in database
GPG Key ID: 0EF6E2C03357A834
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt
View File

@ -414,6 +414,13 @@
There is no value defined for [% field.name | html %]
[% END %]
[% END %]
[% IF ( field.type == 'bool' ) %]
<select name="[% field.name | html %]" >
<option value=""></option>
<option value="1">Yes</option>
<option value="0">No</option>
</select>
[% END %]
[% IF ( field.type == 'date' ) %]
<input type="text" name="[% field.name | html %]" id="[% field.name | html %]" value="" size="10" maxlength="10" class="flatpickr" />
<a href="#" class="clear-date" id="clear-date-[% field.name | html %]" ><i class="fa fa-fw fa-trash-can"></i> Clear</a>

16
tools/modborrowers.pl
View File

@ -196,10 +196,6 @@ if ( $op eq 'cud-show' || $op eq 'show' ) {
my @categories_option;
push @categories_option, { value => $_->categorycode, lib => $_->description } for @patron_categories;
unshift @categories_option, { value => "", lib => "" };
my @protected_option;
push @protected_option, { value => 1, lib => "Yes" };
push @protected_option, { value => 0, lib => "No" };
unshift @protected_option, { value => "", lib => "" };
my $bsort1 = GetAuthorisedValues("Bsort1");
my @sort1_option;
push @sort1_option, { value => $_->{authorised_value}, lib => $_->{lib} } for @$bsort1;
@ -340,9 +336,9 @@ if ( $op eq 'cud-show' || $op eq 'show' ) {
},
);
if ($logged_in_user->is_superlibrarian) {
push @fields, { name => "password_expiration_date", type => "date" } ;
push @fields, { name => "protected", type => "select", option => \@protected_option };
if ( $logged_in_user->is_superlibrarian ) {
push @fields, { name => "password_expiration_date", type => "date" };
push @fields, { name => "protected", type => "bool" };
}
$template->param( 'patron_attributes_codes', \@patron_attributes_codes );
@ -361,8 +357,8 @@ if ( $op eq 'cud-do' ) {
qw/surname firstname branchcode categorycode streetnumber address address2 city state zipcode country email phone mobile fax sort1 sort2 dateenrolled dateexpiry password_expiration_date borrowernotes opacnote debarred debarredcomment protected/
)
{
my $value = $input->param($field) if $input->param($field) ne '';
$infos->{$field} = $value if defined $value;
my $value = $input->param($field);
$infos->{$field} = $value if $value;
$infos->{$field} = "" if grep { $_ eq $field } @disabled;
}
@ -371,7 +367,7 @@ if ( $op eq 'cud-do' ) {
}
delete $infos->{password_expiration_date} unless $logged_in_user->is_superlibrarian;
delete $infos->{protected} unless $logged_in_user->is_superlibrarian;
delete $infos->{protected} unless $logged_in_user->is_superlibrarian;
my @errors;
my @borrowernumbers = $input->multi_param('borrowernumber');