[open-ils-commits] r14819 - trunk/Open-ILS/src/perlmods/OpenILS/Application (erickson)

[svn at svn.open-ils.org]

Author: erickson
Date: 2009-11-06 18:28:34 -0500 (Fri, 06 Nov 2009)
New Revision: 14819

Modified:
   trunk/Open-ILS/src/perlmods/OpenILS/Application/Circ.pm
Log:
added workstation fleshing to some circ retrieval methods

Modified: trunk/Open-ILS/src/perlmods/OpenILS/Application/Circ.pm
===================================================================
--- trunk/Open-ILS/src/perlmods/OpenILS/Application/Circ.pm	2009-11-06 23:24:38 UTC (rev 14818)
+++ trunk/Open-ILS/src/perlmods/OpenILS/Application/Circ.pm	2009-11-06 23:28:34 UTC (rev 14819)
@@ -893,6 +893,7 @@
                 flesh => 1,
                 flesh_fields => {
                     circ => [
+                        'workstation',
                         'checkin_workstation', 
                         'duration_rule', 
                         'max_fine_rule', 
@@ -1380,7 +1381,7 @@
         $circ_id,
         {
             flesh => -1,
-            flesh_fields => {circ => ['parent_circ']}
+            flesh_fields => {circ => [qw/parent_circ workstation checkin_workstation/]}
         }
     ]) or return $e->event;
 
@@ -1402,7 +1403,10 @@
 
     # base circ may not be the end of the chain.  see if there are any subsequent circs
     $circ = $base_circ;
-    $conn->respond($circ) while ($circ = $e->search_action_circulation({parent_circ => $circ->id})->[0]);
+    $conn->respond($circ) while ($circ = $e->search_action_circulation([
+        {parent_circ => $circ->id},
+        {flesh => 1, flesh_fields => {circ => [qw/workstation checkin_workstation/]}}
+    ])->[0]);
 
     return undef;
 }