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

(-)a/Koha/Patron.pm (-8 / +11 lines)
Lines 764-777 sub merge_with { Link Here
764
                $patron->delete();
764
                $patron->delete();
765
765
766
                if ( C4::Context->preference("BorrowersLog") ) {
766
                if ( C4::Context->preference("BorrowersLog") ) {
767
                    my $info =
767
                    my $info = to_json(
768
                          ( $patron->firstname  // "" ) . " "
768
                        {
769
                        . ( $patron->surname    // "" ) . " ("
769
                            patron_firstname  => $patron->firstname  || "",
770
                        . ( $patron->cardnumber // "" ) . ")"
770
                            patron_surname    => $patron->surname    || "",
771
                        . " has been merged into "
771
                            patron_cardnumber => $patron->cardnumber || "",
772
                        . ( $self->firstname  // "" ) . " "
772
                            merged_firstname  => $self->firstname    || "",
773
                        . ( $self->surname    // "" ) . " ("
773
                            merged_surname    => $self->surname      || "",
774
                        . ( $self->cardnumber // "" ) . ")";
774
                            merged_cardnumber => $self->cardnumber   || "",
775
                        },
776
                        { pretty => 1, canonical => 1 }
777
                    );
775
                    logaction( "MEMBERS", "PATRON_MERGE", $self->id, $info );
778
                    logaction( "MEMBERS", "PATRON_MERGE", $self->id, $info );
776
                }
779
                }
777
            }
780
            }
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt (-2 / +9 lines)
Lines 327-333 Link Here
327
                                    [% END %]
327
                                    [% END %]
328
                                </td>
328
                                </td>
329
                                <td>
329
                                <td>
330
                                    [% IF ( loopro.module == 'CIRCULATION' && loopro.object_found ) %]
330
                                    [% IF ( loopro.module == 'MEMBERS' ) %]
331
                                        [% IF ( loopro.action == 'PATRON_MERGE') %]
332
                                            [% loopro.json.patron_firstname | html %]
333
                                            [% loopro.json.patron_surname | html %]
334
                                            ([% loopro.json.patron_cardnumber | html %]) [% tp("[patron] merged into [patron]", "merged into") | html %] [% loopro.json.merged_firstname | html %] [% loopro.json.merged_surname | html %]
335
                                            ([% loopro.json.merged_cardnumber | html %])
336
                                        [% END %]
337
                                    [% ELSIF ( loopro.module == 'CIRCULATION' && loopro.object_found ) %]
331
                                        <a
338
                                        <a
332
                                            href="/cgi-bin/koha/catalogue/moredetail.pl?itemnumber=[% loopro.info | uri %]&amp;biblionumber=[% loopro.biblionumber | uri %]&amp;bi=[% loopro.biblioitemnumber | uri %]#item[% loopro.info | uri %]"
339
                                            href="/cgi-bin/koha/catalogue/moredetail.pl?itemnumber=[% loopro.info | uri %]&amp;biblionumber=[% loopro.biblionumber | uri %]&amp;bi=[% loopro.biblioitemnumber | uri %]#item[% loopro.info | uri %]"
333
                                            title="Display detail for this item"
340
                                            title="Display detail for this item"
Lines 353-359 Link Here
353
                                        <div class="loginfo" id="loginfo[% loopro.action_id | html %]">
360
                                        <div class="loginfo" id="loginfo[% loopro.action_id | html %]">
354
                                            <div>
361
                                            <div>
355
                                                <a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% loopro.json.biblionumber | uri %]" title="Display holds for this record"
362
                                                <a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% loopro.json.biblionumber | uri %]" title="Display holds for this record"
356
                                                    >Hold [% loopro.json.hold | html %] on biblio [% loopro.json.biblionumber | html %]</a
363
                                                    >Hold [% loopro.json.hold | html %] on bibliographic record [% loopro.json.biblionumber | html %]</a
357
                                                >
364
                                                >
358
                                                [% IF loopro.json.itemnumber %]
365
                                                [% IF loopro.json.itemnumber %]
359
                                                    -
366
                                                    -
(-)a/tools/viewlog.pl (-1 / +10 lines)
Lines 205-210 if ($do_it) { Link Here
205
205
206
        #add firstname and surname for borrower, when using the CIRCULATION, MEMBERS, FINES
206
        #add firstname and surname for borrower, when using the CIRCULATION, MEMBERS, FINES
207
        if ( $log->module eq "CIRCULATION" || $log->module eq "MEMBERS" || $log->module eq "FINES" ) {
207
        if ( $log->module eq "CIRCULATION" || $log->module eq "MEMBERS" || $log->module eq "FINES" ) {
208
            my $info = $log->info;
209
            my $decoded;
210
            my $is_json = eval {
211
                $decoded = decode_json($info);
212
                1;
213
            };
214
            if ( $is_json && ref($decoded) ) {
215
                $result->{'json_found'} = 1;
216
                $result->{'json'}       = $decoded;
217
            }
208
            if ( $log->object ) {
218
            if ( $log->object ) {
209
                my $patron = Koha::Patrons->find( $log->object );
219
                my $patron = Koha::Patrons->find( $log->object );
210
                if ( $patron && $output eq 'screen' ) {
220
                if ( $patron && $output eq 'screen' ) {
211
- 

Return to bug 41425