From cc7b73e2dbffb98d9963a69aa1be0da07c4956d6 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Wed, 19 Aug 2020 09:00:12 +0200 Subject: [PATCH] Bug 23816: trivial code simplification Ease readability Signed-off-by: Agustin Moyano https://bugs.koha-community.org/show_bug.cgi?id=23826 Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi --- Koha/Patron/Category.pm | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/Koha/Patron/Category.pm b/Koha/Patron/Category.pm index 346a5d9778..7a4541ebc4 100644 --- a/Koha/Patron/Category.pm +++ b/Koha/Patron/Category.pm @@ -235,9 +235,7 @@ or, if undef, falls back to the OpacResetPassword system preference. sub effective_reset_password { my ($self) = @_; - return ( defined $self->reset_password ) - ? $self->reset_password - : C4::Context->preference('OpacResetPassword'); + return $self->reset_password // C4::Context->preference('OpacResetPassword'); } =head3 effective_change_password @@ -250,41 +248,35 @@ or, if undef, falls back to the OpacPasswordChange system preference. sub effective_change_password { my ($self) = @_; - return ( defined $self->change_password ) - ? $self->change_password - : C4::Context->preference('OpacPasswordChange'); + return $self->change_password // C4::Context->preference('OpacPasswordChange'); } =head3 effective_min_password_length $category->effective_min_password_length() -Retrieve category's password length if setted, or minPasswordLength otherwise +Retrieve category's password length if set, or minPasswordLength otherwise =cut sub effective_min_password_length { my ($self) = @_; - return C4::Context->preference('minPasswordLength') unless defined $self->min_password_length; - - return $self->min_password_length; + return $self->min_password_length // C4::Context->preference('minPasswordLength'); } =head3 effective_require_strong_password $category->effective_require_strong_password() -Retrieve category's password strength if setted, or RequireStrongPassword otherwise +Retrieve category's password strength if set, or RequireStrongPassword otherwise =cut sub effective_require_strong_password { my ($self) = @_; - return C4::Context->preference('RequireStrongPassword') unless defined $self->require_strong_password; - - return $self->require_strong_password; + return $self->require_strong_password // C4::Context->preference('RequireStrongPassword'); } =head3 override_hidden_items -- 2.28.0