[open-ils-commits] [GIT] Evergreen ILS branch rel_3_1 updated. 4017ddc04148d49cc952dc17b10c2dd4f1669611
Evergreen Git
git at git.evergreen-ils.org
Wed Aug 22 10:59:44 EDT 2018
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".
The branch, rel_3_1 has been updated
via 4017ddc04148d49cc952dc17b10c2dd4f1669611 (commit)
via 98820ce8d456bc20e01f52e1bf010cf2667b422a (commit)
from bac23909865c4974fadea38440bf3350b5f2a23e (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 4017ddc04148d49cc952dc17b10c2dd4f1669611
Author: a. bellenir <ab at grpl.org>
Date: Mon Jun 4 14:25:00 2018 -0400
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 at grpl.org>
Signed-off-by: Kathy Lussier <klussier at masslnc.org>
Signed-off-by: Jason Stephenson <jason at sigio.com>
diff --git a/Open-ILS/examples/fm_IDL.xml b/Open-ILS/examples/fm_IDL.xml
index b200065..997afc6 100644
--- a/Open-ILS/examples/fm_IDL.xml
+++ b/Open-ILS/examples/fm_IDL.xml
@@ -7201,7 +7201,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"/>
@@ -7273,6 +7273,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 fdf16e0..5ecef1f 100644
--- 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
--- 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']
},
commit 98820ce8d456bc20e01f52e1bf010cf2667b422a
Author: a. bellenir <ab at grpl.org>
Date: Thu May 24 11:44:28 2018 -0400
LP#1743801: Item Status List View Display Issues
Age Protection was missing '.name' field.
Loan Duration and Fine Levels are numeric: 1, 2, or 3.
Added an Angular filter to show the desired string from numeric index.
Conflicts:
Open-ILS/src/templates/staff/cat/item/t_list.tt2
Signed-off-by: a. bellenir <ab at grpl.org>
Signed-off-by: Kathy Lussier <klussier at masslnc.org>
Signed-off-by: Jason Stephenson <jason at sigio.com>
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 b808dab..fdf16e0 100644
--- a/Open-ILS/src/templates/staff/cat/item/t_list.tt2
+++ b/Open-ILS/src/templates/staff/cat/item/t_list.tt2
@@ -80,7 +80,7 @@
</eg-grid-field>
<eg-grid-field label="[% l('Acquisition Cost') %]" path="cost" hidden></eg-grid-field>
- <eg-grid-field label="[% l('Age-Based Hold Protection') %]" path="age_protect" hidden></eg-grid-field>
+ <eg-grid-field label="[% l('Age-Based Hold Protection') %]" path="age_protect.name" hidden></eg-grid-field>
<eg-grid-field label="[% l('Author') %]" path="call_number.record.simple_record.author" hidden></eg-grid-field>
<eg-grid-field label="[% l('Checkin Date') %]" path="_circ_summary.last_checkin_time" datatype="timestamp" hidden></eg-grid-field>
<eg-grid-field label="[% l('Checkin Scan Date') %]" path="_circ_summary.last_checkin_scan_time" datatype="timestamp" hidden></eg-grid-field>
@@ -108,7 +108,9 @@
<eg-grid-field label="[% l('Deleted?') %]" path="deleted" hidden></eg-grid-field>
<eg-grid-field label="[% l('Document ID') %]" path="call_number.record.id" hidden></eg-grid-field>
<eg-grid-field label="[% l('Edited By') %]" path="editor.usrname" hidden></eg-grid-field>
- <eg-grid-field label="[% l('Fine Level') %]" path="fine_level" hidden></eg-grid-field>
+ <eg-grid-field label="[% l('Fine Level') %]" path="fine_level" hidden>
+ <span>{{item['fine_level'] | string_pick:'[% l('Low') %]':'[% l('Normal') %]':'[% l('High') %]'}}</span>
+ </eg-grid-field>
<eg-grid-field label="[% l('Fines Stopped') %]" path="_circ_summary.last_stop_fines" hidden></eg-grid-field>
<eg-grid-field label="[% l('Fines Stopped Time') %]" path="_circ_summary.last_stop_fines_time" datatype="timestamp" hidden></eg-grid-field>
<eg-grid-field label="[% l('Floating Group') %]" path="floating.name" hidden></eg-grid-field>
@@ -116,7 +118,9 @@
<eg-grid-field label="[% l('Holds Count') %]" path="holds_count" hidden></eg-grid-field>
<eg-grid-field label="[% l('In-House Uses') %]" path="_inHouseUseCount" hidden></eg-grid-field>
<eg-grid-field label="[% l('ISBN') %]" path="call_number.record.simple_record.isbn" hidden></eg-grid-field>
- <eg-grid-field label="[% l('Loan Duration') %]" path="loan.duration" hidden></eg-grid-field>
+ <eg-grid-field label="[% l('Loan Duration') %]" path="loan_duration" hidden>
+ <span>{{item['loan_duration'] | string_pick:'[% l('Short') %]':'[% l('Normal') %]':'[% l('Extended') %]'}}</span>
+ </eg-grid-field>
<eg-grid-field label="[% l('OPAC Visible?') %]" path="opac_visible" hidden></eg-grid-field>
<eg-grid-field label="[% l('Owned By') %]" path="call_number.record.owner" hidden></eg-grid-field>
<eg-grid-field label="[% l('Owning Library') %]" path="call_number.owning_lib.shortname" 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 46a977d..4c13dd3 100644
--- a/Open-ILS/web/js/ui/default/staff/circ/services/item.js
+++ b/Open-ILS/web/js/ui/default/staff/circ/services/item.js
@@ -949,3 +949,4 @@ function(egCore , egCirc , $uibModal , $q , $timeout , $window , egConfirmDialog
return service;
}])
+.filter('string_pick', function() { return function(i){ return arguments[i] || ''; }; })
-----------------------------------------------------------------------
Summary of changes:
Open-ILS/examples/fm_IDL.xml | 3 ++-
Open-ILS/src/templates/staff/cat/item/t_list.tt2 | 12 ++++++++----
.../web/js/ui/default/staff/circ/services/item.js | 3 ++-
3 files changed, 12 insertions(+), 6 deletions(-)
hooks/post-receive
--
Evergreen ILS
More information about the open-ils-commits
mailing list