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

(-)a/Koha/Patron.pm (-9 / +12 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
            }
Lines 1088-1094 sub set_password { Link Here
1088
                    module      => 'members',
1091
                    module      => 'members',
1089
                    letter_code => 'PASSWORD_CHANGE',
1092
                    letter_code => 'PASSWORD_CHANGE',
1090
                    branchcode  => $self_from_storage->branchcode,
1093
                    branchcode  => $self_from_storage->branchcode,
1091
                    ,
1094
1092
                    lang   => $self_from_storage->lang || 'default',
1095
                    lang   => $self_from_storage->lang || 'default',
1093
                    tables => {
1096
                    tables => {
1094
                        'branches'  => $self_from_storage->branchcode,
1097
                        'branches'  => $self_from_storage->branchcode,
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt (-2 / +12 lines)
Lines 337-343 Link Here
337
                                    [% END %]
337
                                    [% END %]
338
                                </td>
338
                                </td>
339
                                <td>
339
                                <td>
340
                                    [% IF ( loopro.module == 'CIRCULATION' && loopro.object_found ) %]
340
                                    [% IF ( loopro.module == 'MEMBERS' && loopro.action == 'PATRON_MERGE' ) %]
341
                                        [% IF ( loopro.json ) %]
342
                                            [% loopro.json.patron_firstname | html %]
343
                                            [% loopro.json.patron_surname | html %]
344
                                            ([% loopro.json.patron_cardnumber | html %]) [% tp("[patron] merged into [patron]", "merged into") | html %] [% loopro.json.merged_firstname | html %] [% loopro.json.merged_surname | html %]
345
                                            ([% loopro.json.merged_cardnumber | html %])
346
                                        [% ELSE %]
347
                                            [%# Merge message was not stored as JSON %]
348
                                            [% loopro.info | html %]
349
                                        [% END %]
350
                                    [% ELSIF ( loopro.module == 'CIRCULATION' && loopro.object_found ) %]
341
                                        <a
351
                                        <a
342
                                            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 %]"
352
                                            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 %]"
343
                                            title="Display detail for this item"
353
                                            title="Display detail for this item"
Lines 363-369 Link Here
363
                                        <div class="loginfo" id="loginfo[% loopro.action_id | html %]">
373
                                        <div class="loginfo" id="loginfo[% loopro.action_id | html %]">
364
                                            <div>
374
                                            <div>
365
                                                <a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% loopro.json.biblionumber | uri %]" title="Display holds for this record"
375
                                                <a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% loopro.json.biblionumber | uri %]" title="Display holds for this record"
366
                                                    >Hold [% loopro.json.hold | html %] on biblio [% loopro.json.biblionumber | html %]</a
376
                                                    >Hold [% loopro.json.hold | html %] on bibliographic record [% loopro.json.biblionumber | html %]</a
367
                                                >
377
                                                >
368
                                                [% IF loopro.json.itemnumber %]
378
                                                [% IF loopro.json.itemnumber %]
369
                                                    -
379
                                                    -
(-)a/tools/viewlog.pl (-1 / +10 lines)
Lines 208-213 if ($do_it) { Link Here
208
            || $log->module eq "FINES"
208
            || $log->module eq "FINES"
209
            || $log->module eq "APIKEYS" )
209
            || $log->module eq "APIKEYS" )
210
        {
210
        {
211
            my $info = $log->info;
212
            my $decoded;
213
            my $is_json = eval {
214
                $decoded = decode_json($info);
215
                1;
216
            };
217
            if ( $is_json && ref($decoded) ) {
218
                $result->{'json_found'} = 1;
219
                $result->{'json'}       = $decoded;
220
            }
211
            if ( $log->object ) {
221
            if ( $log->object ) {
212
                my $patron = Koha::Patrons->find( $log->object );
222
                my $patron = Koha::Patrons->find( $log->object );
213
                if ( $patron && $output eq 'screen' ) {
223
                if ( $patron && $output eq 'screen' ) {
214
- 

Return to bug 41425