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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/merge-patrons.tt (-2 / +4 lines)
Lines 249-255 Link Here
249
            <div class="modal-body">
249
            <div class="modal-body">
250
                <div class="compare">
250
                <div class="compare">
251
                    <div id="col-label">
251
                    <div id="col-label">
252
                        <div><strong data-field="name">Name:</strong></div>
252
                        <div><strong data-field="surname">Surname:</strong></div>
253
                        <div><strong data-field="firstname">First name:</strong></div>
253
                        <div><strong data-field="preferred_name">Preferred name:</strong></div>
254
                        <div><strong data-field="preferred_name">Preferred name:</strong></div>
254
                        <div><strong data-field="initials">Initials:</strong></div>
255
                        <div><strong data-field="initials">Initials:</strong></div>
255
                        <div><strong data-field="othernames">Other name:</strong></div>
256
                        <div><strong data-field="othernames">Other name:</strong></div>
Lines 284-290 Link Here
284
                            <!-- prettier-ignore-start -->
285
                            <!-- prettier-ignore-start -->
285
<!-- <pre> block is unindented to avoid unwanted whitespace -->
286
<!-- <pre> block is unindented to avoid unwanted whitespace -->
286
<pre>
287
<pre>
287
[% IF ( p.surname ) %][% p.surname | html %], [% p.firstname | html %][% ELSE %]-[% END %]
288
[% IF ( p.surname ) %][% p.surname | html %][% ELSE %]-[% END %]
289
[% IF ( p.firstname ) %][% p.firstname | html %][% ELSE %]-[% END %]
288
[% IF ( p.preferred_name ) %][% p.preferred_name | html %][% ELSE %]-[% END %]
290
[% IF ( p.preferred_name ) %][% p.preferred_name | html %][% ELSE %]-[% END %]
289
[% IF ( p.initials ) %][% p.initials | html %][% ELSE %]-[% END %]
291
[% IF ( p.initials ) %][% p.initials | html %][% ELSE %]-[% END %]
290
[% IF ( p.othernames ) %][% p.othernames | html %][% ELSE %]-[% END %]
292
[% IF ( p.othernames ) %][% p.othernames | html %][% ELSE %]-[% END %]
(-)a/members/merge-patrons.pl (-8 / +2 lines)
Lines 41-48 my $op = $cgi->param('op') || 'show'; Link Here
41
my @ids = $cgi->multi_param('id');
41
my @ids = $cgi->multi_param('id');
42
42
43
my $copy   = $cgi->param('copy');
43
my $copy   = $cgi->param('copy');
44
my $name   = $cgi->param('name');
45
my @fields = qw(
44
my @fields = qw(
45
    surname
46
    firstname
46
    preferred_name
47
    preferred_name
47
    initials
48
    initials
48
    othernames
49
    othernames
Lines 80-91 for my $field (@fields) { Link Here
80
    }
81
    }
81
}
82
}
82
83
83
if ($name) {
84
    my @names = split( ', ', $name );
85
    $data{'firstname'} = $names[0];
86
    $data{'surname'}   = $names[1];
87
}
88
89
if ( $op eq 'show' ) {
84
if ( $op eq 'show' ) {
90
    my $patrons = Koha::Patrons->search( { borrowernumber => { -in => \@ids } } );
85
    my $patrons = Koha::Patrons->search( { borrowernumber => { -in => \@ids } } );
91
    $template->param( patrons => $patrons );
86
    $template->param( patrons => $patrons );
92
- 

Return to bug 30303