From b34167505f80fe3f08159462a32ec8fb25241e3b Mon Sep 17 00:00:00 2001 From: Llewellyn Marshall Date: Mon, 17 Apr 2023 16:01:45 -0400 Subject: [PATCH] mixup on expire age, only get expire age when none found from CPP --- Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Account.pm | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Account.pm b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Account.pm index de312996e1..2bdc6f1f3c 100644 --- a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Account.pm +++ b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Account.pm @@ -74,14 +74,18 @@ sub prepare_user_password_info { })->[0]; if(defined $cpp){ - $self->ctx->{password_hint} = $cpp->{'hint'}; - $self->ctx->{password_age} = $cpp->{'max_age'}; - $self->ctx->{password_regex} = $cpp->{'regex'}; + $self->ctx->{password_hint} = $cpp->{'hint'}; + $self->ctx->{password_regex} = $cpp->{'regex'}; + $self->ctx->{password_expire_age} = $cpp->{'max_age'}; } + $self->ctx->{password_age} = int($U->simplereq( + 'open-ils.actor', + 'open-ils.actor.get_password_age', $e->authtoken, $usr->id)); $self->ctx->{password_expire_age} = int($U->simplereq( 'open-ils.actor', - 'open-ils.actor.get_password_expire_age', $e->authtoken, $usr->id)); + 'open-ils.actor.get_password_expire_age', $e->authtoken, $usr->id)) + unless defined $self->ctx->{password_expire_age}; } # Given an event returned by a failed attempt to create a hold, do we have -- 2.11.0