Bugzilla – Attachment 175255 Details for
Bug 37360
Add 'protected status' as one of the things that can be updated via batch patron modification
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 37360: (follow-up) added bool type to modborrowers
Bug-37360-follow-up-added-bool-type-to-modborrower.patch (text/plain), 4.50 KB, created by
Marcel de Rooy
on 2024-12-06 09:38:55 UTC
(
hide
)
Description:
Bug 37360: (follow-up) added bool type to modborrowers
Filename:
MIME Type:
Creator:
Marcel de Rooy
Created:
2024-12-06 09:38:55 UTC
Size:
4.50 KB
patch
obsolete
>From 2ac79d590b471197543a0f7a364e9b8daa88f3fe Mon Sep 17 00:00:00 2001 >From: Jake Deery <jake.deery@ptfs-europe.com> >Date: Fri, 4 Oct 2024 11:35:40 +0000 >Subject: [PATCH] Bug 37360: (follow-up) added bool type to modborrowers >Content-Type: text/plain; charset=utf-8 > >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> >--- > .../prog/en/modules/tools/modborrowers.tt | 7 +++++++ > tools/modborrowers.pl | 16 ++++++---------- > 2 files changed, 13 insertions(+), 10 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt >index 67cb3ebb91..476f98b2e4 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt >@@ -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> >diff --git a/tools/modborrowers.pl b/tools/modborrowers.pl >index c1036a6b59..9e1830ddb2 100755 >--- a/tools/modborrowers.pl >+++ b/tools/modborrowers.pl >@@ -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'); >-- >2.39.5
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 37360
:
170932
|
170991
|
172385
|
172977
|
172978
|
173273
|
173274
|
173275
|
173276
|
174919
|
175253
|
175254
| 175255