@@ -, +, @@ OPAC - Go through the OPAC pages, check that the password change strings and - Sign off :-D --- koha-tmpl/opac-tmpl/bootstrap/en/includes/usermenu.inc | 2 +- koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-passwd.tt | 4 ++-- .../en/modules/opac-registration-confirmation.tt | 8 +++++++- opac/opac-memberentry.pl | 3 --- opac/opac-passwd.pl | 2 +- opac/opac-registration-verify.pl | 5 +---- 6 files changed, 12 insertions(+), 12 deletions(-) --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/usermenu.inc +++ a/koha-tmpl/opac-tmpl/bootstrap/en/includes/usermenu.inc @@ -40,7 +40,7 @@ your tags [% END %] - [% IF ( OpacPasswordChange ) %] + [% IF logged_in_user.category.effective_change_password %] [% IF ( passwdview ) %]
  • [% ELSE %] --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-passwd.tt +++ a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-passwd.tt @@ -51,7 +51,7 @@ [% END # /IF Error_messages %] - [% IF ( OpacPasswordChange ) %] + [% IF logged_in_user.category.effective_change_password %] [% IF ( Ask_data ) %]
    @@ -66,7 +66,7 @@ [% END # /IF Ask_data %] [% ELSE %]
    You can't change your password.
    - [% END # /IF OpacPasswordChange %] + [% END # /IF logged_in_user.category.effective_change_password %] [% IF ( password_updated ) %]
    --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-registration-confirmation.tt +++ a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-registration-confirmation.tt @@ -53,7 +53,13 @@

    [% END %] -

    For your convenience, the login box on this page has been pre-filled with this data. Please log in[% IF OpacPasswordChange %] and change your password[% END %].

    +

    + [% IF borrower.category.effective_change_password %] + For your convenience, the login box on this page has been pre-filled with this data. Please log in and change your password. + [% ELSE %] + For your convenience, the login box on this page has been pre-filled with this data. Please log in. + [% END %] +

    [% END %]
    [% PatronSelfRegistrationAdditionalInstructions | $raw %]
    --- a/opac/opac-memberentry.pl +++ a/opac/opac-memberentry.pl @@ -205,9 +205,6 @@ if ( $action eq 'create' ) { } ); - $template->param( OpacPasswordChange => - C4::Context->preference('OpacPasswordChange') ); - $borrower{categorycode} ||= C4::Context->preference('PatronSelfRegistrationDefaultCategory'); $borrower{password} ||= Koha::AuthUtils::generate_password; my $consent_dt = delete $borrower{gdpr_proc_consent}; --- a/opac/opac-passwd.pl +++ a/opac/opac-passwd.pl @@ -44,7 +44,7 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user( ); my $patron = Koha::Patrons->find( $borrowernumber ); -if ( C4::Context->preference("OpacPasswordChange") ) { +if ( $patron->category->effective_change_password ) { if ( $query->param('Oldkey') && $query->param('Newkey') && $query->param('Confirm') ) --- a/opac/opac-registration-verify.pl +++ a/opac/opac-registration-verify.pl @@ -58,9 +58,6 @@ if ( } ); - $template->param( - OpacPasswordChange => C4::Context->preference('OpacPasswordChange') ); - my $patron_attrs = $m->unblessed; $patron_attrs->{password} ||= Koha::AuthUtils::generate_password; my $consent_dt = delete $patron_attrs->{gdpr_proc_consent}; @@ -76,7 +73,7 @@ if ( C4::Form::MessagingPreferences::handle_form_action($cgi, { borrowernumber => $patron->borrowernumber }, $template, 1, C4::Context->preference('PatronSelfRegistrationDefaultCategory') ) if C4::Context->preference('EnhancedMessagingPreferences'); $template->param( password_cleartext => $patron->plain_text_password ); - $template->param( borrower => $patron->unblessed ); + $template->param( borrower => $patron ); $template->param( PatronSelfRegistrationAdditionalInstructions => C4::Context->preference( --