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

(-)a/Koha/Patron.pm (-1 / +33 lines)
Lines 196-201 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
199
=head3 store
230
=head3 store
200
231
201
Patron specific store method to cleanup record
232
Patron specific store method to cleanup record
Lines 240-246 sub store { Link Here
240
                if C4::Context->preference("uppercasesurnames");
271
                if C4::Context->preference("uppercasesurnames");
241
272
242
            # Add preferred name unless specified
273
            # Add preferred name unless specified
243
            unless ( $self->preferred_name ) {
274
            if ( !defined $self->preferred_name || $self->preferred_name =~ /^\s*$/ ) {
244
                $self->preferred_name( $self->firstname );
275
                $self->preferred_name( $self->firstname );
245
            }
276
            }
246
277
Lines 424-429 sub store { Link Here
424
455
425
                # Final store
456
                # Final store
426
                $self = $self->SUPER::store;
457
                $self = $self->SUPER::store;
458
                
427
            }
459
            }
428
        }
460
        }
429
    );
461
    );
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-title.inc (-4 / +4 lines)
Lines 77-85 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 data.preferred_name -%][%- WRAPPER maybe_span field_name='preferred_name' -%][%- data.preferred_name | html %][% END -%][% END -%]
80
            [%- IF ( patron.preferred_name ) -%]
81
            [%- IF !(data.preferred_name) -%]
81
                [%- WRAPPER maybe_span field_name='preferred_name' -%][%- patron.preferred_name | html %][%- END -%]
82
                [%- WRAPPER maybe_span field_name = 'firstname' -%][%- data.firstname |html %][% END -%]
82
            [%- ELSIF ( data.firstname ) -%]
83
                [%- WRAPPER maybe_span field_name = 'firstname' -%][%- data.firstname | html -%][%- END -%]
83
            [%- END -%]
84
            [%- END -%]
84
            [%- IF data.middle_name -%][%- WRAPPER maybe_span field_name='middle_name' -%][% ' ' _ data.middle_name | html -%][%- END -%][%- END -%]
85
            [%- IF data.middle_name -%][%- WRAPPER maybe_span field_name='middle_name' -%][% ' ' _ data.middle_name | html -%][%- END -%][%- END -%]
85
            [%- IF data.othernames -%]
86
            [%- IF data.othernames -%]
86
- 

Return to bug 41780