[open-ils-commits] r17103 - in trunk/Open-ILS: src/perlmods/OpenILS/Application xul/staff_client/server/circ (phasefx)

[svn at svn.open-ils.org]

Author: phasefx
Date: 2010-08-05 15:08:08 -0400 (Thu, 05 Aug 2010)
New Revision: 17103

Modified:
   trunk/Open-ILS/src/perlmods/OpenILS/Application/Circ.pm
   trunk/Open-ILS/xul/staff_client/server/circ/alternate_copy_summary.js
   trunk/Open-ILS/xul/staff_client/server/circ/alternate_copy_summary.xul
Log:
fix open-ils.circ.prev_renewal_chain.retrieve_by_circ.summary to return the correct user for the previous circ chain, and some debugging tweaks to Item Status Alternate View and avoid a widget collision with hold patrons

Modified: trunk/Open-ILS/src/perlmods/OpenILS/Application/Circ.pm
===================================================================
--- trunk/Open-ILS/src/perlmods/OpenILS/Application/Circ.pm	2010-08-05 16:27:49 UTC (rev 17102)
+++ trunk/Open-ILS/src/perlmods/OpenILS/Application/Circ.pm	2010-08-05 19:08:08 UTC (rev 17103)
@@ -1679,7 +1679,7 @@
         my $target_copy = $$first_circ{'target_copy'};
         my $usr = $$first_circ{'usr'};
         my $last_circ_from_prev_chain = $e->json_query({
-            'select' => { 'circ' => ['id'] },
+            'select' => { 'circ' => ['id','usr'] },
             'from' => 'circ', 
             'where' => {
                 target_copy => $target_copy,
@@ -1694,7 +1694,7 @@
         return undef unless $sum;
         my $obj = Fieldmapper::action::circ_chain_summary->new;
         $obj->$_($sum->{$_}) for keys %$sum;
-        return { 'summary' => $obj, 'usr' => $usr };
+        return { 'summary' => $obj, 'usr' => $$last_circ_from_prev_chain{'usr'} };
 
     } else {
 

Modified: trunk/Open-ILS/xul/staff_client/server/circ/alternate_copy_summary.js
===================================================================
--- trunk/Open-ILS/xul/staff_client/server/circ/alternate_copy_summary.js	2010-08-05 16:27:49 UTC (rev 17102)
+++ trunk/Open-ILS/xul/staff_client/server/circ/alternate_copy_summary.js	2010-08-05 19:08:08 UTC (rev 17103)
@@ -401,6 +401,7 @@
                     patron.util.format_name( r_au ) + ' : ' + r_au.card().barcode(),
                     details.circ.usr()
                 );
+                set_tooltip('patron_name','circ id ' + details.circ.id());
             });
             set("xact_finish", util.date.formatted_date( details.circ.xact_finish(), '%{localized}' )); 
             set("xact_start", util.date.formatted_date( details.circ.xact_start(), '%{localized}' )); 
@@ -442,6 +443,7 @@
                             patron.util.format_name( r_au ) + ' : ' + r_au.card().barcode(),
                             robj['usr']
                         );
+                        set_tooltip('prev_patron_name','circ chain prior to circ id ' + details.circ.id());
                     });
                     set("prev_num_circs", summary.num_circs());
                     set("prev_num_renewals", Number(summary.num_circs()) - 1);
@@ -556,6 +558,7 @@
         set_tooltip("selection_ou", '');
         set("target", '');
         set("hold_usr", '');
+        set("hold_patron_name", '');
         set("cancel_time", '');
         set("notify_time", '');
         set("notify_count", '');
@@ -591,7 +594,7 @@
 
             JSAN.use('patron.util'); 
             var au_obj = patron.util.retrieve_fleshed_au_via_id( ses(), details.hold.usr() );
-            $('patron_name').setAttribute('value', $('circStrings').getFormattedString('staff.circ.copy_details.user_details', [au_obj.family_name(), au_obj.first_given_name(), au_obj.card().barcode()]) );
+            $('hold_patron_name').setAttribute('value', $('circStrings').getFormattedString('staff.circ.copy_details.user_details', [au_obj.family_name(), au_obj.first_given_name(), au_obj.card().barcode()]) );
 
             set("hold_status", details.hold.status()); 
             set("transit", details.hold.transit()); 

Modified: trunk/Open-ILS/xul/staff_client/server/circ/alternate_copy_summary.xul
===================================================================
--- trunk/Open-ILS/xul/staff_client/server/circ/alternate_copy_summary.xul	2010-08-05 16:27:49 UTC (rev 17102)
+++ trunk/Open-ILS/xul/staff_client/server/circ/alternate_copy_summary.xul	2010-08-05 19:08:08 UTC (rev 17103)
@@ -278,7 +278,7 @@
                 <tabpanel orient="vertical"><!-- Hold/Transit -->
                     <groupbox flex="1" id="holds" style="overflow: none; min-height: 80;">
                         <caption id="hold_caption" label="&staff.circ.copy_details.hold_caption;"/>
-                        <label id="patron_name" class="patronNameLarge"/>
+                        <label id="hold_patron_name" class="patronNameLarge"/>
                         <tree id="hold" flex="1" enableColumnDrag="true"/>
                         <spacer FIXME="label and tree get swapped without this"/>
                     </groupbox>