[open-ils-commits] r11842 - in trunk/Open-ILS: src/perlmods/OpenILS/Application xul/staff_client/server/patron

[svn at svn.open-ils.org]

Author: erickson
Date: 2009-01-15 09:12:48 -0500 (Thu, 15 Jan 2009)
New Revision: 11842

Modified:
   trunk/Open-ILS/src/perlmods/OpenILS/Application/Actor.pm
   trunk/Open-ILS/xul/staff_client/server/patron/util.js
Log:
changed params to user merge for simpler management in the client code

Modified: trunk/Open-ILS/src/perlmods/OpenILS/Application/Actor.pm
===================================================================
--- trunk/Open-ILS/src/perlmods/OpenILS/Application/Actor.pm	2009-01-15 14:05:09 UTC (rev 11841)
+++ trunk/Open-ILS/src/perlmods/OpenILS/Application/Actor.pm	2009-01-15 14:12:48 UTC (rev 11842)
@@ -3097,19 +3097,19 @@
 	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;
 

Modified: trunk/Open-ILS/xul/staff_client/server/patron/util.js
===================================================================
--- trunk/Open-ILS/xul/staff_client/server/patron/util.js	2009-01-15 14:05:09 UTC (rev 11841)
+++ trunk/Open-ILS/xul/staff_client/server/patron/util.js	2009-01-15 14:12:48 UTC (rev 11842)
@@ -785,7 +785,6 @@
             [ 
                 ses(), 
                 fancy_prompt_data.lead,
-                {}, 
                 util.functional.filter_list( record_ids,
                     function(o) {
                         return o != fancy_prompt_data.lead;