flesh checkin_workstation on copy detail retrieve. changed reltyp for workstation...

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

diff --git a/Open-ILS/examples/fm_IDL.xml b/Open-ILS/examples/fm_IDL.xml
index 8e76924..c98b440 100644 (file)
--- a/Open-ILS/examples/fm_IDL.xml
+++ b/Open-ILS/examples/fm_IDL.xml
@@ -2100,8 +2100,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
                        <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">

diff --git a/Open-ILS/src/perlmods/OpenILS/Application/Circ.pm b/Open-ILS/src/perlmods/OpenILS/Application/Circ.pm
index e9867b1..c04724f 100644 (file)
--- a/Open-ILS/src/perlmods/OpenILS/Application/Circ.pm
+++ b/Open-ILS/src/perlmods/OpenILS/Application/Circ.pm
@@ -756,7 +756,12 @@ sub copy_details {
        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];