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

(-)a/Koha/Patron.pm (-31 lines)
Lines 196-232 sub plain_text_password { Link Here
196
    return;
196
    return;
197
}
197
}
198
198
199
sub preferred_name {
200
201
    my ( $self ) = @_;
202
203
    my $val = $self->_result->preferred_name;
204
205
    return $self->{_cached_preferred_name} if exists $self->{_cached_preferred_name};
206
207
    if ( !defined $val || $val =~ /^\s*$/ ) {
208
        my $fname = $self->firstname;
209
        if ( defined $fname && $fname ne '' ) {
210
211
            return $fname if (!$self->in_storage || $self->_result->is_changed);
212
213
            eval {
214
                $self->_result->update({ preferred_name => $fname });
215
                $self->_result->discard_changes;
216
            };
217
218
            if ($@) {
219
                warn "Non-fatal: Could not auto-sync preferred_name for patron " . $self->borrowernumber . ": $@";
220
            }
221
222
            return $fname;
223
        }
224
    }
225
226
    $self->{_cached_preferred_name} = $val;
227
    return $val;
228
}
229
230
=head3 store
199
=head3 store
231
200
232
Patron specific store method to cleanup record
201
Patron specific store method to cleanup record
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-title.inc (-6 / +5 lines)
Lines 7-13 Link Here
7
    [%- SET data.surname        = patron.surname -%]
7
    [%- SET data.surname        = patron.surname -%]
8
    [%- SET data.othernames     = patron.othernames -%]
8
    [%- SET data.othernames     = patron.othernames -%]
9
    [%- SET data.firstname      = patron.firstname -%]
9
    [%- SET data.firstname      = patron.firstname -%]
10
    [%- SET data.preferred_name = patron.preferred_name -%]
10
    [%- SET data.preferred_name = patron.preferred_name || patron.firstname -%]
11
    [%- SET data.middle_name    = patron.middle_name -%]
11
    [%- SET data.middle_name    = patron.middle_name -%]
12
    [%- SET data.cardnumber     = patron.cardnumber -%]
12
    [%- SET data.cardnumber     = patron.cardnumber -%]
13
    [%- SET data.borrowernumber = patron.borrowernumber -%]
13
    [%- SET data.borrowernumber = patron.borrowernumber -%]
Lines 17-23 Link Here
17
    [%- SET data.surname        = borrower.surname -%]
17
    [%- SET data.surname        = borrower.surname -%]
18
    [%- SET data.othernames     = borrower.othernames -%]
18
    [%- SET data.othernames     = borrower.othernames -%]
19
    [%- SET data.firstname      = borrower.firstname -%]
19
    [%- SET data.firstname      = borrower.firstname -%]
20
    [%- SET data.preferred_name = borrower.preferred_name -%]
20
    [%- SET data.preferred_name = borrower.preferred_name || borrower.firstname -%]
21
    [%- SET data.middle_name    = borrower.middle_name -%]
21
    [%- SET data.middle_name    = borrower.middle_name -%]
22
    [%- SET data.cardnumber     = borrower.cardnumber -%]
22
    [%- SET data.cardnumber     = borrower.cardnumber -%]
23
    [%- SET data.borrowernumber = borrower.borrowernumber -%]
23
    [%- SET data.borrowernumber = borrower.borrowernumber -%]
Lines 27-33 Link Here
27
    [%- SET data.surname        = surname -%]
27
    [%- SET data.surname        = surname -%]
28
    [%- SET data.othernames     = othernames -%]
28
    [%- SET data.othernames     = othernames -%]
29
    [%- SET data.firstname      = firstname -%]
29
    [%- SET data.firstname      = firstname -%]
30
    [%- SET data.preferred_name = preferred_name -%]
30
    [%- SET data.preferred_name = preferred_name || firstname -%]
31
    [%- SET data.middle_name    = middle_name -%]
31
    [%- SET data.middle_name    = middle_name -%]
32
    [%- SET data.cardnumber     = cardnumber -%]
32
    [%- SET data.cardnumber     = cardnumber -%]
33
    [%- SET data.borrowernumber = borrowernumber -%]
33
    [%- SET data.borrowernumber = borrowernumber -%]
Lines 77-84 Link Here
77
            [%- END -%]
77
            [%- END -%]
78
        [%- ELSE -%]
78
        [%- ELSE -%]
79
            [%- IF (data.title) %][%- WRAPPER maybe_span field_name='patron_title' -%][%- data.title _ ' ' | html -%][%- END -%][%- END -%]
79
            [%- IF (data.title) %][%- WRAPPER maybe_span field_name='patron_title' -%][%- data.title _ ' ' | html -%][%- END -%][%- END -%]
80
            [%- IF ( patron.preferred_name ) -%]
80
            [%- IF ( data.preferred_name ) -%]
81
                [%- WRAPPER maybe_span field_name='preferred_name' -%][%- patron.preferred_name | html %][%- END -%]
81
                [%- WRAPPER maybe_span field_name='preferred_name' -%][%- data.preferred_name | html %][%- END -%]
82
            [%- ELSIF ( data.firstname ) -%]
82
            [%- ELSIF ( data.firstname ) -%]
83
                [%- WRAPPER maybe_span field_name = 'firstname' -%][%- data.firstname | html -%][%- END -%]
83
                [%- WRAPPER maybe_span field_name = 'firstname' -%][%- data.firstname | html -%][%- END -%]
84
            [%- END -%]
84
            [%- END -%]
85
- 

Return to bug 41780