From 41fa262a96a5cfff70561a572aafb2b9af1eadf9 Mon Sep 17 00:00:00 2001 From: Kyle Hall Date: Wed, 19 Oct 2022 10:59:08 -0400 Subject: [PATCH] Bug 27920: (QA follow-up) Change radios to a single select pulldown Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi --- .../prog/en/modules/tools/import_borrowers.tt | 16 ++++++++-------- tools/import_borrowers.pl | 7 +++---- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/import_borrowers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/import_borrowers.tt index 8ac4815c92..4dff078763 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/import_borrowers.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/import_borrowers.tt @@ -321,16 +321,16 @@
  • - - -
  • -
  • - - + +
  • - - + +
diff --git a/tools/import_borrowers.pl b/tools/import_borrowers.pl index da932523b4..a02f14dc40 100755 --- a/tools/import_borrowers.pl +++ b/tools/import_borrowers.pl @@ -114,8 +114,7 @@ if ( $uploadborrowers && length($uploadborrowers) > 0 ) { my $handle = $input->upload('uploadborrowers'); my %defaults = $input->Vars; my $overwrite_passwords = defined $input->param('overwrite_passwords') ? 1 : 0; - my $update_dateexpiry = defined $input->param('update_dateexpiry') ? 1 : 0; - my $update_dateexpiry_from_today = defined $input->param('update_dateexpiry_from_today') ? 1 : 0; + my $update_dateexpiry = $input->param('update_dateexpiry'); my $return = $Import->import_patrons( { file => $handle, @@ -125,8 +124,8 @@ if ( $uploadborrowers && length($uploadborrowers) > 0 ) { overwrite_passwords => $overwrite_passwords, preserve_extended_attributes => scalar $input->param( 'ext_preserve' ) || 0, preserve_fields => \@preserve_fields, - update_dateexpiry => $update_dateexpiry, - update_dateexpiry_from_today => $update_dateexpiry_from_today, + update_dateexpiry => $update_dateexpiry ? 1 : 0, + update_dateexpiry_from_today => $update_dateexpiry eq "now" ? 1 : 0, send_welcome => $welcome_new, } ); -- 2.39.5