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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/merge-patrons.tt (-4 / +3 lines)
Lines 70-76 Link Here
70
                                <tr>
70
                                <tr>
71
                                    <td><input class='keeper' type='radio' name='keeper' value='[% p.id %]' /></td>
71
                                    <td><input class='keeper' type='radio' name='keeper' value='[% p.id %]' /></td>
72
                                    <td>[% p.cardnumber | html %]</td>
72
                                    <td>[% p.cardnumber | html %]</td>
73
                                    <td>[% p.firstname | html %] [% p.surname | html %]</td>
73
                                    <td>[% INCLUDE 'patron-title.inc' patron = p %]</td>
74
                                    <td>[% p.dateofbirth | $KohaDates %]</td>
74
                                    <td>[% p.dateofbirth | $KohaDates %]</td>
75
                                    <td>[% Categories.GetName( p.categorycode ) %] ([% p.categorycode %])</td>
75
                                    <td>[% Categories.GetName( p.categorycode ) %] ([% p.categorycode %])</td>
76
                                    <td>[% Branches.GetName( p.branchcode ) %]</td>
76
                                    <td>[% Branches.GetName( p.branchcode ) %]</td>
Lines 95-107 Link Here
95
                    <div class="dialog alert">Merge failed! The following error was reported: [% error %].</div>
95
                    <div class="dialog alert">Merge failed! The following error was reported: [% error %].</div>
96
                [% ELSE %]
96
                [% ELSE %]
97
                    <p>
97
                    <p>
98
                        Patron records merged into <a href="moremember.pl?borrowernumber=[% keeper.id %]">[% keeper.firstname %] [% keeper.surname %] ([% keeper.cardnumber | html %])</a>
98
                        Patron records merged into <a href="moremember.pl?borrowernumber=[% keeper.id %]">[% INCLUDE 'patron-title.inc' patron = keeper %]</a>
99
                    </p>
99
                    </p>
100
100
101
                    [% FOREACH pair IN results.merged.pairs %]
101
                    [% FOREACH pair IN results.merged.pairs %]
102
                        [% SET patron = pair.value.patron %]
102
                        [% SET patron = pair.value.patron %]
103
103
104
                        <h5>[% patron.firstname %] [% patron.surname %] ([% patron.cardnumber %])</h5>
104
                        <h5>[% INCLUDE 'patron-title.inc' %]</h5>
105
105
106
                        [% FOREACH r IN pair.value.updated.pairs %]
106
                        [% FOREACH r IN pair.value.updated.pairs %]
107
                            [% SET name = r.key %]
107
                            [% SET name = r.key %]
108
- 

Return to bug 9302