Attachment 142741 Details for Bug 27920 – Bug 27920: (QA follow-up) Change radios to a single select pulldown

[patch] Bug 27920: (QA follow-up) Change radios to a single select pulldown

Bug-27920-QA-follow-up-Change-radios-to-a-single-s.patch (text/plain), 4.54 KB, created by Katrin Fischer on 2022-10-27 21:38:29 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Katrin Fischer

Created: 2022-10-27 21:38:29 UTC

Size: 4.54 KB

patch

obsolete

>From fd8a16ca5d796cbf533c5756222bb46689902713 Mon Sep 17 00:00:00 2001
>From: Kyle Hall <kyle@bywatersolutions.com>
>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 <katrin.fischer.83@web.de>
>---
> .../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 @@
>                     <input type="radio" id="overwrite_cardnumberyes" name="overwrite_cardnumber" value="1" /><label for="overwrite_cardnumberyes">Overwrite the existing one with this</label>
>                     <ul>
>                         <li>
>-                            <input class="overwrite_passwords" type="checkbox" id="overwrite_passwords" name="overwrite_passwords" disabled/>
>-                            <label class="overwrite_passwords" for="overwrite_passwords">Replace patron passwords with those in the file (blank passwords will be ignored)</label>
>-                        </li>
>-                        <li>
>-                            <input class="update_dateexpiry" type="checkbox" id="update_dateexpiry" name="update_dateexpiry" disabled/>
>-                            <label class="update_dateexpiry" for="update_dateexpiry">Update existing patron expiration dates.</label>
>+                            <label class="update_dateexpiry" for="update_dateexpiry">Renew existing patrons</label>
>+                            <select class="update_dateexpiry" type="select" id="update_dateexpiry" name="update_dateexpiry" disabled/>
>+                                <option value="">using the datexpiry value in the file, if present</option>
>+                                <option value="dateexpiry">from the current membership expiry date</option>
>+                                <option value="now">from the current date</option>
>+                            </select>
>                         </li>
>                         <li>
>-                            <input class="update_dateexpiry_from_today" type="checkbox" id="update_dateexpiry_from_today" name="update_dateexpiry_from_today" disabled/>
>-                            <label class="update_dateexpiry_from_today" for="update_dateexpiry_from_today">Update patron's expiration date based on the current date instead of the patron's enrollment date</label>
>+                            <input class="overwrite_passwords" type="checkbox" id="overwrite_passwords" name="overwrite_passwords" disabled/>
>+                            <label class="overwrite_passwords" for="overwrite_passwords">Replace patron passwords with those in the file (blank passwords will be ignored)</label>
>                         </li>
>                     </ul>
>                 </li>
>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.30.2

Actions: View | Diff | Splinter Review

Attachments on bug 27920: 118079 | 119234 | 120940 | 120951 | 121885 | 121886 | 138524 | 139017 | 139018 | 139019 | 142176 | 142178 | 142738 | 142739 | 142740 | 142741 | 142742 | 142743 | 142744