changed params to user merge for simpler management in the client code

git-svn-id: svn://svn.open-ils.org/ILS/trunk@11842 dcc99617-32d9-48b4-a31d-7c20da2025e4

diff --git a/Open-ILS/src/perlmods/OpenILS/Application/Actor.pm b/Open-ILS/src/perlmods/OpenILS/Application/Actor.pm
index 571b65e..7bc1112 100644 (file)
--- a/Open-ILS/src/perlmods/OpenILS/Application/Actor.pm
+++ b/Open-ILS/src/perlmods/OpenILS/Application/Actor.pm
@@ -3097,19 +3097,19 @@ __PACKAGE__->register_method (
        api_name        => 'open-ils.actor.user.merge',
        signature       => {
         desc => q/
-            Given a source user and destination user, transfer all data from the source
-            to the dest. user and delete the source user.  All user related data is 
+            Given a list of source users and destination user, transfer all data from the source
+            to the dest user and delete the source user.  All user related data is 
             transferred, including circulations, holds, bookbags, etc.
         /
     }
 );
 
 sub merge_users {
-    my($self, $conn, $auth, $master_id, $options, @user_ids) = @_;
+    my($self, $conn, $auth, $master_id, $user_ids, $options) = @_;
     my $e = new_editor(xact => 1, authtoken => $auth);
        return $e->die_event unless $e->checkauth;
 
-    for my $src_id (@user_ids) {
+    for my $src_id (@$user_ids) {
         my $src_user = $e->retrieve_actor_user($src_id) or return $e->die_event;
         my $master_user = $e->retrieve_actor_user($master_id) or return $e->die_event;
 

diff --git a/Open-ILS/xul/staff_client/server/patron/util.js b/Open-ILS/xul/staff_client/server/patron/util.js
index 05ceb19..a9a4e69 100644 (file)
--- a/Open-ILS/xul/staff_client/server/patron/util.js
+++ b/Open-ILS/xul/staff_client/server/patron/util.js
@@ -785,7 +785,6 @@ patron.util.merge = function(record_ids) {
             [ 
                 ses(), 
                 fancy_prompt_data.lead,
-                {}, 
                 util.functional.filter_list( record_ids,
                     function(o) {
                         return o != fancy_prompt_data.lead;