LP#1743801: Item Status List Display Issues

Update fm_IDL.xml, establishing circ_as_type as a link to
config::item_type_map.  Flesh this field to display desired value on
client side.

Conflicts:
    Open-ILS/web/js/ui/default/staff/circ/services/item.js

Signed-off-by: a. bellenir <ab@grpl.org>
Signed-off-by: Kathy Lussier <klussier@masslnc.org>
Signed-off-by: Jason Stephenson <jason@sigio.com>

diff --git a/Open-ILS/examples/fm_IDL.xml b/Open-ILS/examples/fm_IDL.xml
index 66d146e..2a7005f 100644 (file)
--- a/Open-ILS/examples/fm_IDL.xml
+++ b/Open-ILS/examples/fm_IDL.xml
@@ -7342,7 +7342,7 @@ SELECT  usr,
                        <field reporter:label="Alert Message" name="alert_message" reporter:datatype="text"/>
                        <field reporter:label="Barcode" name="barcode" reporter:datatype="text"/>
                        <field reporter:label="Call Number/Volume" name="call_number" reporter:datatype="link"/>
-                       <field reporter:label="Circulation Type (MARC)" name="circ_as_type" reporter:datatype="text"/>
+                       <field reporter:label="Circulation Type (MARC)" name="circ_as_type" reporter:datatype="link"/>
                        <field reporter:label="Circulating Library" name="circ_lib"  reporter:datatype="org_unit"/>
                        <field reporter:label="Circulation Modifier" name="circ_modifier" reporter:datatype="link"/>
                        <field reporter:label="Can Circulate" name="circulate" reporter:datatype="bool"/>
@@ -7414,6 +7414,7 @@ SELECT  usr,
                        <link field="holds_count" reltype="might_have" key="id" map="" class="hasholdscount"/>
                        <link field="tags" reltype="has_many" key="copy" map="" class="acptcm"/>
                        <link field="copy_alerts" reltype="has_many" key="copy" map="" class="aca"/>
+                       <link field="circ_as_type" reltype="has_a" key="code" map="" class="citm"/>
                </links>
         <permacrud xmlns="http://open-ils.org/spec/opensrf/IDL/permacrud/v1">
             <actions>

diff --git a/Open-ILS/src/templates/staff/cat/item/t_list.tt2 b/Open-ILS/src/templates/staff/cat/item/t_list.tt2
index 15e0486..111e722 100644 (file)
--- a/Open-ILS/src/templates/staff/cat/item/t_list.tt2
+++ b/Open-ILS/src/templates/staff/cat/item/t_list.tt2
@@ -94,7 +94,7 @@
   <eg-grid-field label="[% l('Classification') %]"        path="call_number.label_class.name" hidden></eg-grid-field>
   <eg-grid-field label="[% l('CN Prefix') %]"             path="call_number.prefix.label" hidden></eg-grid-field>
   <eg-grid-field label="[% l('CN Suffix') %]"             path="call_number.suffix.label" hidden></eg-grid-field>
-  <eg-grid-field label="[% l('Circulate as Type') %]"     path="circ_as_type" hidden></eg-grid-field>
+  <eg-grid-field label="[% l('Circulate as Type') %]"     path="circ_as_type.value" hidden></eg-grid-field>
   <eg-grid-field label="[% l('Circulate?') %]"            path="circulate" hidden></eg-grid-field>
   <eg-grid-field label="[% l('Circulation Library') %]"   path="circ_lib.shortname" hidden></eg-grid-field>
   <eg-grid-field label="[% l('Circulation Modifier') %]"  path="circ_modifier.name" hidden></eg-grid-field>

diff --git a/Open-ILS/web/js/ui/default/staff/circ/services/item.js b/Open-ILS/web/js/ui/default/staff/circ/services/item.js
index 4c13dd3..f8e0d9c 100644 (file)
--- a/Open-ILS/web/js/ui/default/staff/circ/services/item.js
+++ b/Open-ILS/web/js/ui/default/staff/circ/services/item.js
@@ -16,7 +16,7 @@ function(egCore , egCirc , $uibModal , $q , $timeout , $window , egConfirmDialog
         flesh : 3, 
         flesh_fields : {
             acp : ['call_number','location','status','location','floating','circ_modifier',
-                'age_protect','circ_lib','copy_alerts', 'editor'],
+                'age_protect','circ_lib','copy_alerts', 'editor', 'circ_as_type'],
             acn : ['record','prefix','suffix','label_class'],
             bre : ['simple_record','creator','editor']
         },