From 6d92775e8660c808501e370c3d04944e3e9e89bd Mon Sep 17 00:00:00 2001 From: Nick Clemens Date: Tue, 4 Feb 2020 12:14:51 +0000 Subject: [PATCH] Bug 23473: (follow-up) Fix QA complaints (tabs, filters, Dumper) --- Koha/Patrons/Import.pm | 32 +++++++++++----------- .../prog/en/modules/tools/import_borrowers.tt | 2 +- t/db_dependent/Koha/Patrons/Import.t | 1 - 3 files changed, 17 insertions(+), 18 deletions(-) diff --git a/Koha/Patrons/Import.pm b/Koha/Patrons/Import.pm index 87e448a69c..4dae7770b6 100644 --- a/Koha/Patrons/Import.pm +++ b/Koha/Patrons/Import.pm @@ -294,22 +294,22 @@ sub import_patrons { try { $patron->set_password({ password => $borrower{password} }); } - catch { - if ( $_->isa('Koha::Exceptions::Password::TooShort') ) { - push @errors, { passwd_too_short => 1, borrowernumber => $borrowernumber, length => $_->{length}, min_length => $_->{min_length} }; - } - elsif ( $_->isa('Koha::Exceptions::Password::WhitespaceCharacters') ) { - push @errors, { passwd_whitespace => 1, borrowernumber => $borrowernumber } ; - } - elsif ( $_->isa('Koha::Exceptions::Password::TooWeak') ) { - push @errors, { passwd_too_weak => 1, borrowernumber => $borrowernumber } ; - } - elsif ( $_->isa('Koha::Exceptions::Password::Plugin') ) { - push @errors, { passwd_plugin_err => 1, borrowernumber => $borrowernumber } ; - } - else { - push @errors, { passwd_unknown_err => 1, borrowernumber => $borrowernumber } ; - } + catch { + if ( $_->isa('Koha::Exceptions::Password::TooShort') ) { + push @errors, { passwd_too_short => 1, borrowernumber => $borrowernumber, length => $_->{length}, min_length => $_->{min_length} }; + } + elsif ( $_->isa('Koha::Exceptions::Password::WhitespaceCharacters') ) { + push @errors, { passwd_whitespace => 1, borrowernumber => $borrowernumber } ; + } + elsif ( $_->isa('Koha::Exceptions::Password::TooWeak') ) { + push @errors, { passwd_too_weak => 1, borrowernumber => $borrowernumber } ; + } + elsif ( $_->isa('Koha::Exceptions::Password::Plugin') ) { + push @errors, { passwd_plugin_err => 1, borrowernumber => $borrowernumber } ; + } + else { + push @errors, { passwd_unknown_err => 1, borrowernumber => $borrowernumber } ; + } } } if ($extended) { 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 915525de75..5ee2fadf72 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 @@ -117,7 +117,7 @@ [% END %] [% IF e.passwd_too_short %]
  • - Password is too short for patron with borrowernumber [% e.borrowernumber | html %]. Minimum length is [% e.min_length %], length is [% e.length %] + Password is too short for patron with borrowernumber [% e.borrowernumber | html %]. Minimum length is [% e.min_length | html %], length is [% e.length | html %]
  • [% END %] [% IF e.passwd_whitespace %] diff --git a/t/db_dependent/Koha/Patrons/Import.t b/t/db_dependent/Koha/Patrons/Import.t index 15c751297a..de5327e4b6 100644 --- a/t/db_dependent/Koha/Patrons/Import.t +++ b/t/db_dependent/Koha/Patrons/Import.t @@ -491,7 +491,6 @@ subtest 'test_import_with_password_overwrite' => sub { $ernest->store; $result = $patrons_import->import_patrons($params_4, $defaults); - warn Data::Dumper::Dumper( $result ); $ernest = Koha::Patrons->find({ userid => 'ErnestP' }); is($ernest->surname,'Worrell',"Patron is overwritten, surname changed"); is($ernest->password,$orig_pass,"Patron is imported, password is not changed for staff"); -- 2.11.0