[open-ils-commits] r14038 - in trunk/Open-ILS: examples src/perlmods/OpenILS/Application (erickson)

[svn at svn.open-ils.org]

Author: erickson
Date: 2009-09-17 11:34:59 -0400 (Thu, 17 Sep 2009)
New Revision: 14038

Modified:
   trunk/Open-ILS/examples/fm_IDL.xml
   trunk/Open-ILS/src/perlmods/OpenILS/Application/Circ.pm
Log:
flesh checkin_workstation on copy detail retrieve.  changed reltyp for workstation and checkin_worksation to has_a

Modified: trunk/Open-ILS/examples/fm_IDL.xml
===================================================================
--- trunk/Open-ILS/examples/fm_IDL.xml	2009-09-17 15:31:14 UTC (rev 14037)
+++ trunk/Open-ILS/examples/fm_IDL.xml	2009-09-17 15:34:59 UTC (rev 14038)
@@ -2100,8 +2100,8 @@
 			<link field="circ_type" reltype="might_have" key="id" map="" class="rcirct"/>
 			<link field="billing_total" reltype="might_have" key="xact" map="" class="rxbt"/>
 			<link field="payment_total" reltype="might_have" key="xact" map="" class="rxpt"/>
-			<link field="workstation" reltype="might_have" key="id" map="" class="aws"/>
-			<link field="checkin_workstation" reltype="might_have" key="id" map="" class="aws"/>
+			<link field="workstation" reltype="has_a" key="id" map="" class="aws"/>
+			<link field="checkin_workstation" reltype="has_a" key="id" map="" class="aws"/>
 		</links>
 	</class>
 	<class id="combcirc" controller="open-ils.cstore" oils_obj:fieldmapper="action::all_circulation" oils_persist:tablename="action.all_circulation" reporter:core="true" reporter:label="Combined Aged and Active Circulations" oils_persist:readonly="true">

Modified: trunk/Open-ILS/src/perlmods/OpenILS/Application/Circ.pm
===================================================================
--- trunk/Open-ILS/src/perlmods/OpenILS/Application/Circ.pm	2009-09-17 15:31:14 UTC (rev 14037)
+++ trunk/Open-ILS/src/perlmods/OpenILS/Application/Circ.pm	2009-09-17 15:34:59 UTC (rev 14038)
@@ -756,7 +756,12 @@
 	my $circ = $e->search_action_circulation(
 		[
 			{ target_copy => $copy_id },
-			{ order_by => { circ => 'xact_start desc' }, limit => 1 }
+			{ 
+                flesh => 1,
+                flesh_fields => {circ => ['checkin_workstation']},
+                order_by => { circ => 'xact_start desc' }, 
+                limit => 1 
+            }
 		]
 	)->[0];