gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug 22632: (follow-up) Use PATRON_MERGE as log action 

Signed-off-by: Andrew Fuerste Henry <andrew@bywatersolutions.com>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
(cherry picked from commit 80c656d79e)
Signed-off-by: Paul Derscheid <paul.derscheid@lmscloud.de>
This commit is contained in:
Owen Leonard 2023-10-17 15:48:16 +00:00 committed by Paul Derscheid
parent f0b80e6c79
commit 8a09899885
No known key found for this signature in database
GPG Key ID: C25F9FD44CED595B
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Koha/Patron.pm
View File

@ -802,7 +802,7 @@ sub merge_with {
. $self->firstname . " "
. $self->surname . " ("
. $self->cardnumber . ")";
logaction( "MEMBERS", "Merge", $self->id, $info );
logaction( "MEMBERS", "PATRON_MERGE", $self->id, $info );
}
}
}

2
koha-tmpl/intranet-tmpl/prog/en/includes/action-logs.inc
View File

@ -133,6 +133,8 @@
<span>Run</span>
[% CASE 'End' %]
<span>End</span>
[% CASE 'PATRON_MERGE' %]
<span>Merge</span>
[% CASE 'EDIT_MAPPINGS' %]
<span>Edit mappings</span>
[% CASE 'RESET_MAPPINGS' %]

2
koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt
View File

@ -147,7 +147,7 @@
<label for="actionALL" class="viewlog"><input type="checkbox" id="actionALL" name="actions" value="" /> All</label>
[% END %]
[% 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' ] %]
[% 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' ] %]
[% IF actions.grep(actx).size %]
<label for="action[% actx| replace('\s+', '_') | html %]" class="viewlog"
><input type="checkbox" id="action[% actx | replace('\s+', '_') | html %]" name="actions" value="[% actx | html %]" checked="checked" /> [% PROCESS translate_log_action action=actx %]</label

6
t/db_dependent/Koha/Patron/Log.t
View File

@ -41,7 +41,7 @@ subtest 'Test Koha::Patrons::merge' => sub {
my $results = $keeper->merge_with([ $borrower1->{borrowernumber}, $borrower2->{borrowernumber} ]);
my $log=GetLogs("","","",["MEMBERS"],["Merge"],$keeper->id,"");
my $log=GetLogs("","","",["MEMBERS"],["PATRON_MERGE"],$keeper->id,"");
my $info_borrower1 = $borrower1->{firstname} . " " . $borrower1->{surname} . " (" . $borrower1->{cardnumber} . ") has been merged into " .
$keeper->firstname . " " . $keeper->surname . " (" . $keeper->cardnumber . ")";
@ -63,7 +63,7 @@ subtest 'Test Koha::Patrons::merge' => sub {
$results = $keeper->merge_with([ $borrower3->{borrowernumber}, $borrower4->{borrowernumber} ]);
$log=GetLogs("","","",["MEMBERS"],["Merge"],$keeper->id,"");
$log=GetLogs("","","",["MEMBERS"],["PATRON_MERGE"],$keeper->id,"");
$info_log = $log->[0]{info};
is($info_log,undef,"GetLogs didn't returns results in the log viewer for the merge of " . $borrower3->{borrowernumber});
@ -73,4 +73,4 @@ subtest 'Test Koha::Patrons::merge' => sub {
is($info_log,undef,"GetLogs didn't returns results in the log viewer for the merge of " . $borrower4->{borrowernumber});
};
$schema->storage->txn_rollback;
$schema->storage->txn_rollback;