View | Details | Raw Unified | Return to bug 33832
Collapse All | Expand All

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-password.tt (-1 / +3 lines)
Lines 193-199 Link Here
193
            });
193
            });
194
        });
194
        });
195
    </script>
195
    </script>
196
    [% PROCESS 'password_check.inc' new_password => 'newpassword', minPasswordLength => patron.category.effective_min_password_length, RequireStrongPassword => patron.category.effective_require_strong_password %]
196
    [% IF new_password.defined %]
197
        [% PROCESS 'password_check.inc' new_password => 'newpassword', minPasswordLength => patron.category.effective_min_password_length, RequireStrongPassword => patron.category.effective_require_strong_password %]
198
    [% END %]
197
[% END %]
199
[% END %]
198
200
199
[% INCLUDE 'intranet-bottom.inc' %]
201
[% INCLUDE 'intranet-bottom.inc' %]
(-)a/members/member-password.pl (-4 / +5 lines)
Lines 55-67 if ( ( $patron_id ne $loggedinuser ) && ( $category_type eq 'S' ) ) { Link Here
55
55
56
push( @errors, 'NOMATCH' ) if ( ( $newpassword && $newpassword2 ) && ( $newpassword ne $newpassword2 ) );
56
push( @errors, 'NOMATCH' ) if ( ( $newpassword && $newpassword2 ) && ( $newpassword ne $newpassword2 ) );
57
57
58
if ( $op eq 'cud-update' && $newpassword and not @errors ) {
58
if ( $op eq 'cud-update' && $newpassword.defined and not @errors ) {
59
59
60
    try {
60
    try {
61
        $patron->set_password({ password => $newpassword });
61
        if ( $newpassword ne '' ) {
62
            $patron->set_password({ password => $newpassword });
63
            $template->param( newpassword => $newpassword );
64
        }
62
        $patron->userid($new_user_id)->store
65
        $patron->userid($new_user_id)->store
63
            if $new_user_id and $new_user_id ne $patron->userid;
66
            if $new_user_id and $new_user_id ne $patron->userid;
64
        $template->param( newpassword => $newpassword );
65
        if ( $destination eq 'circ' ) {
67
        if ( $destination eq 'circ' ) {
66
            print $input->redirect("/cgi-bin/koha/circ/circulation.pl?findborrower=" . $patron->cardnumber);
68
            print $input->redirect("/cgi-bin/koha/circ/circulation.pl?findborrower=" . $patron->cardnumber);
67
        }
69
        }
68
- 

Return to bug 33832