Bug 23473: (follow-up) check if overwrite_passwords is set

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

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 52a07d9..e7c4631 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/import_borrowers.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/import_borrowers.tt
@@ -222,8 +222,8 @@
                     <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 type="checkbox" id="overwrite_passwords" name="overwrite_passwords" disabled="true"/>
-                            <label for="overwrite_passwords">Replace patron passwords with those in the file</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</label>
                         </li
                     </ul>
                 </li>

diff --git a/tools/import_borrowers.pl b/tools/import_borrowers.pl
index b10e023..f2b72c2 100755 (executable)
--- a/tools/import_borrowers.pl
+++ b/tools/import_borrowers.pl
@@ -121,14 +121,14 @@ 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 $return = $Import->import_patrons(
         {
             file                         => $handle,
             defaults                     => \%defaults,
             matchpoint                   => $matchpoint,
             overwrite_cardnumber         => $input->param('overwrite_cardnumber'),
-            overwrite_passwords          => $input->param('overwrite_passwords'),
+            overwrite_passwords          => $overwrite_passwords,
             preserve_extended_attributes => $input->param('ext_preserve') || 0,
         }
     );