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

(-)a/Koha/Patron.pm (-1 / +1 lines)
Lines 802-808 sub merge_with { Link Here
802
                        . $self->firstname . " "
802
                        . $self->firstname . " "
803
                        . $self->surname . " ("
803
                        . $self->surname . " ("
804
                        . $self->cardnumber . ")";
804
                        . $self->cardnumber . ")";
805
                    logaction( "MEMBERS", "Merge", $self->id, $info );
805
                    logaction( "MEMBERS", "PATRON_MERGE", $self->id, $info );
806
                }
806
                }
807
            }
807
            }
808
        }
808
        }
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/action-logs.inc (+2 lines)
Lines 133-138 Link Here
133
        <span>Run</span>
133
        <span>Run</span>
134
    [% CASE 'End' %]
134
    [% CASE 'End' %]
135
        <span>End</span>
135
        <span>End</span>
136
    [% CASE 'PATRON_MERGE' %]
137
        <span>Merge</span>
136
    [% CASE 'EDIT_MAPPINGS' %]
138
    [% CASE 'EDIT_MAPPINGS' %]
137
        <span>Edit mappings</span>
139
        <span>Edit mappings</span>
138
    [% CASE 'RESET_MAPPINGS' %]
140
    [% CASE 'RESET_MAPPINGS' %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt (-1 / +1 lines)
Lines 147-153 Link Here
147
                            <label for="actionALL" class="viewlog"><input type="checkbox" id="actionALL" name="actions" value="" /> All</label>
147
                            <label for="actionALL" class="viewlog"><input type="checkbox" id="actionALL" name="actions" value="" /> All</label>
148
                        [% END %]
148
                        [% END %]
149
149
150
                        [% FOREACH actx IN [ 'ADD' 'DELETE' 'MODIFY' 'ISSUE' 'RETURN' 'RENEW' 'CREATE' 'CANCEL' 'FILL' 'SUSPEND' 'RESUME' 'ADDCIRCMESSAGE' 'MODCIRCMESSAGE' 'DELCIRCMESSAGE' 'STATUS_CHANGE' 'PATRON_NOTICE' 'CHANGE PASS' 'RESET PASS' 'Run' 'End' 'Merge' 'EDIT_MAPPINGS' 'RESET_MAPPINGS' 'ADD_BASKET' 'MODIFY_BASKET' 'MODIFY_BASKET_HEADER' 'MODIFY_BASKET_USERS' 'CLOSE_BASKET' 'APPROVE_BASKET' 'REOPEN_BASKET' 'CANCEL_ORDER' 'CREATE_ORDER' 'MODIFY_ORDER' 'CREATE_INVOICE_ADJUSTMENT' 'UPDATE_INVOICE_ADJUSTMENT' 'DELETE_INVOICE_ADJUSTMENT' 'RECEIVE_ORDER' 'MODIFY_BUDGET' 'MODIFY_FUND' 'CREATE_FUND' 'DELETE_FUND' 'ACQUISITION CLAIM' 'ACQUISITION ORDER' 'OVERDUE' 'EXPIRE' 'CREATE_RESTRICTION' 'MODIFY_RESTRICTION' 'DELETE_RESTRICTION' 'MODIFY_CARDNUMBER' ] %]
150
                        [% FOREACH actx IN [ 'ADD' 'DELETE' 'MODIFY' 'ISSUE' 'RETURN' 'RENEW' 'CREATE' 'CANCEL' 'FILL' 'SUSPEND' 'RESUME' 'ADDCIRCMESSAGE' 'MODCIRCMESSAGE' 'DELCIRCMESSAGE' 'STATUS_CHANGE' 'PATRON_NOTICE' 'CHANGE PASS' 'RESET PASS' 'Run' 'End' 'PATRON_MERGE' 'EDIT_MAPPINGS' 'RESET_MAPPINGS' 'ADD_BASKET' 'MODIFY_BASKET' 'MODIFY_BASKET_HEADER' 'MODIFY_BASKET_USERS' 'CLOSE_BASKET' 'APPROVE_BASKET' 'REOPEN_BASKET' 'CANCEL_ORDER' 'CREATE_ORDER' 'MODIFY_ORDER' 'CREATE_INVOICE_ADJUSTMENT' 'UPDATE_INVOICE_ADJUSTMENT' 'DELETE_INVOICE_ADJUSTMENT' 'RECEIVE_ORDER' 'MODIFY_BUDGET' 'MODIFY_FUND' 'CREATE_FUND' 'DELETE_FUND' 'ACQUISITION CLAIM' 'ACQUISITION ORDER' 'OVERDUE' 'EXPIRE' 'CREATE_RESTRICTION' 'MODIFY_RESTRICTION' 'DELETE_RESTRICTION' 'MODIFY_CARDNUMBER' ] %]
151
                            [% IF actions.grep(actx).size %]
151
                            [% IF actions.grep(actx).size %]
152
                                <label for="action[% actx| replace('\s+', '_') | html %]" class="viewlog"
152
                                <label for="action[% actx| replace('\s+', '_') | html %]" class="viewlog"
153
                                    ><input type="checkbox" id="action[% actx | replace('\s+', '_') | html %]" name="actions" value="[% actx | html %]" checked="checked" /> [% PROCESS translate_log_action action=actx %]</label
153
                                    ><input type="checkbox" id="action[% actx | replace('\s+', '_') | html %]" name="actions" value="[% actx | html %]" checked="checked" /> [% PROCESS translate_log_action action=actx %]</label
(-)a/t/db_dependent/Koha/Patron/Log.t (-4 / +3 lines)
Lines 41-47 subtest 'Test Koha::Patrons::merge' => sub { Link Here
41
41
42
    my $results = $keeper->merge_with([ $borrower1->{borrowernumber}, $borrower2->{borrowernumber} ]);
42
    my $results = $keeper->merge_with([ $borrower1->{borrowernumber}, $borrower2->{borrowernumber} ]);
43
43
44
    my $log=GetLogs("","","",["MEMBERS"],["Merge"],$keeper->id,"");
44
    my $log=GetLogs("","","",["MEMBERS"],["PATRON_MERGE"],$keeper->id,"");
45
45
46
    my $info_borrower1 = $borrower1->{firstname} . " " . $borrower1->{surname} . " (" . $borrower1->{cardnumber} . ") has been merged into " .
46
    my $info_borrower1 = $borrower1->{firstname} . " " . $borrower1->{surname} . " (" . $borrower1->{cardnumber} . ") has been merged into " .
47
    $keeper->firstname . " " . $keeper->surname . " (" . $keeper->cardnumber . ")";
47
    $keeper->firstname . " " . $keeper->surname . " (" . $keeper->cardnumber . ")";
Lines 63-69 subtest 'Test Koha::Patrons::merge' => sub { Link Here
63
63
64
    $results = $keeper->merge_with([ $borrower3->{borrowernumber}, $borrower4->{borrowernumber} ]);
64
    $results = $keeper->merge_with([ $borrower3->{borrowernumber}, $borrower4->{borrowernumber} ]);
65
65
66
    $log=GetLogs("","","",["MEMBERS"],["Merge"],$keeper->id,"");
66
    $log=GetLogs("","","",["MEMBERS"],["PATRON_MERGE"],$keeper->id,"");
67
    $info_log = $log->[0]{info};
67
    $info_log = $log->[0]{info};
68
68
69
    is($info_log,undef,"GetLogs didn't returns results in the log viewer for the merge of " . $borrower3->{borrowernumber});
69
    is($info_log,undef,"GetLogs didn't returns results in the log viewer for the merge of " . $borrower3->{borrowernumber});
Lines 73-76 subtest 'Test Koha::Patrons::merge' => sub { Link Here
73
    is($info_log,undef,"GetLogs didn't returns results in the log viewer for the merge of " . $borrower4->{borrowernumber});
73
    is($info_log,undef,"GetLogs didn't returns results in the log viewer for the merge of " . $borrower4->{borrowernumber});
74
};
74
};
75
75
76
$schema->storage->txn_rollback;
76
$schema->storage->txn_rollback;
77
- 

Return to bug 22632