From ade2cfa642814e26e48a0e85fa0fa9f562f8c135 Mon Sep 17 00:00:00 2001 From: erickson Date: Thu, 15 Jan 2009 21:53:22 +0000 Subject: [PATCH] added org settings for deleting addrs, cards, and deactivating cards at user merge git-svn-id: svn://svn.open-ils.org/ILS/trunk@11855 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- .../src/perlmods/OpenILS/Application/Actor.pm | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/Open-ILS/src/perlmods/OpenILS/Application/Actor.pm b/Open-ILS/src/perlmods/OpenILS/Application/Actor.pm index 8dab7b6e0b..2a5d5456c1 100644 --- a/Open-ILS/src/perlmods/OpenILS/Application/Actor.pm +++ b/Open-ILS/src/perlmods/OpenILS/Application/Actor.pm @@ -3110,6 +3110,13 @@ sub merge_users { return $e->die_event unless $e->checkauth; my $master_user = $e->retrieve_actor_user($master_id) or return $e->die_event; + my $del_addrs = ($U->ou_ancestor_setting_value( + $master_user->home_ou, 'circ.user_merge.delete_addresses', $e)) ? 't' : 'f'; + my $del_cards = ($U->ou_ancestor_setting_value( + $master_user->home_ou, 'circ.user_merge.delete_cards', $e)) ? 't' : 'f'; + my $deactivate_cards = ($U->ou_ancestor_setting_value( + $master_user->home_ou, 'circ.user_merge.deactivate_cards', $e)) ? 't' : 'f'; + for my $src_id (@$user_ids) { my $src_user = $e->retrieve_actor_user($src_id) or return $e->die_event; @@ -3119,7 +3126,14 @@ sub merge_users { } return $e->die_event unless - $e->json_query({from => ['actor.usr_merge', $src_id, $master_id]}); + $e->json_query({from => [ + 'actor.usr_merge', + $src_id, + $master_id, + $del_addrs, + $del_cards, + $deactivate_cards + ]}); } $e->commit; -- 2.43.2