[open-ils-commits] [GIT] Evergreen ILS branch rel_3_3 updated. 4af104b7aee90f7232d9011f1bc981a252a2c725

[Evergreen Git]

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_3 has been updated
       via  4af104b7aee90f7232d9011f1bc981a252a2c725 (commit)
      from  984167cd30a728f26a3a1379da2bcb759766da9b (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 4af104b7aee90f7232d9011f1bc981a252a2c725
Author: Jane Sandberg <sandbej at linnbenton.edu>
Date:   Wed Aug 21 10:26:47 2019 -0700

    LP1739607: Add missing columns to patron record
    
    To test:
    1) Open up a patron record with some bills.
    2) On the Items Out tab, notice that there is a column named Location
    3) On the Bills tab, open up Bill history.
    4) In the history transactions grid, note that the column picker is
    missing the following columns:
      * Item owning library
      * Checkout/renewal library
      * Due date
      * Fines Stopped Reason
    5) In the history payments grid, note that the column picker is missing
    the same columns.
    6) Apply this commit.
    7) Note that the Items Out tab's column is renamed to "Shelving
    Location".
    8) Notice that both Bill history grids column pickers include the
    requested columns.
    
    Signed-off-by: Jane Sandberg <sandbej at linnbenton.edu>
    Signed-off-by: Josh Stompro <stompro at stompro.org>
    Signed-off-by: Jason Boyer <jboyer at equinoxinitiative.org>

diff --git a/Open-ILS/src/templates/staff/circ/patron/t_bill_history_payments.tt2 b/Open-ILS/src/templates/staff/circ/patron/t_bill_history_payments.tt2
index 328ab1d097..bbea99843a 100644
--- a/Open-ILS/src/templates/staff/circ/patron/t_bill_history_payments.tt2
+++ b/Open-ILS/src/templates/staff/circ/patron/t_bill_history_payments.tt2
@@ -37,7 +37,10 @@
     <!-- needed for item link -->
     <eg-grid-field name="copy_id" 
       path="xact.circulation.target_copy.id" required hidden></eg-grid-field>
-
+    <eg-grid-field path="xact.circulation.target_copy.circ_lib.shortname" name="owning_lib" label="[% l('Item Owning Library') %]"></eg-grid-field>
+    <eg-grid-field path="xact.circulation.circ_lib.shortname" name="circ_lib" label="[% l('Checkout or Renewal Library') %]" hidden></eg-grid-field>
+    <eg-grid-field path="xact.circulation.due_date" label="[% l('Due Date') %]" datefilter="egDueDate" hidden></eg-grid-field>
+    <eg-grid-field path="xact.circulation.stop_fines" label="[% l('Fine Stop Reason') %]" hidden></eg-grid-field>
     <!-- ... -->
 
     <eg-grid-field path="xact.id" required hidden></eg-grid-field>
diff --git a/Open-ILS/src/templates/staff/circ/patron/t_bill_history_xacts.tt2 b/Open-ILS/src/templates/staff/circ/patron/t_bill_history_xacts.tt2
index 99d6a86b59..b429440805 100644
--- a/Open-ILS/src/templates/staff/circ/patron/t_bill_history_xacts.tt2
+++ b/Open-ILS/src/templates/staff/circ/patron/t_bill_history_xacts.tt2
@@ -47,6 +47,10 @@
 
     <eg-grid-field path="summary.*" hidden></eg-grid-field>
     <eg-grid-field path="circulation.target_copy.*" hidden></eg-grid-field>
+    <eg-grid-field path="circulation.target_copy.circ_lib.shortname" label="[% l('Item Owning Library') %]"></eg-grid-field>
+    <eg-grid-field path="circulation.circ_lib.shortname" label="[% l('Checkout or Renewal Library') %]" hidden></eg-grid-field>
+    <eg-grid-field path="circulation.due_date" label="[% l('Due Date') %]" datefilter="egDueDate" hidden></eg-grid-field>
+    <eg-grid-field path="circulation.stop_fines" label="[% l('Fine Stop Reason') %]" hidden></eg-grid-field>
     <eg-grid-field path="circulation.target_copy.call_number.*" hidden></eg-grid-field>
     <eg-grid-field path="circulation.target_copy.call_number.prefix.label" label="[% l('CN Prefix') %]" hidden></eg-grid-field>
     <eg-grid-field path="circulation.target_copy.call_number.suffix.label" label="[% l('CN Suffix') %]" hidden></eg-grid-field>
diff --git a/Open-ILS/src/templates/staff/circ/patron/t_items_out.tt2 b/Open-ILS/src/templates/staff/circ/patron/t_items_out.tt2
index 6c10e6fda0..8dc89022e1 100644
--- a/Open-ILS/src/templates/staff/circ/patron/t_items_out.tt2
+++ b/Open-ILS/src/templates/staff/circ/patron/t_items_out.tt2
@@ -87,7 +87,7 @@
   <eg-grid-field label="[% l('Circulation Library') %]" path='target_copy.circ_lib.shortname' hidden></eg-grid-field>
   <eg-grid-field label="[% l('Age-based Hold Protection') %]" path='target_copy.age_protect.name' hidden></eg-grid-field>
   <eg-grid-field label="[% l('Floating Group') %]" path='target_copy.floating.name' hidden></eg-grid-field>
-  <eg-grid-field label="[% l('Location') %]" path='target_copy.location.name' hidden></eg-grid-field>
+  <eg-grid-field label="[% l('Shelving Location') %]" path='target_copy.location.name' hidden></eg-grid-field>
   <eg-grid-field label="[% l('Owning Library') %]" path='target_copy.call_number.owning_lib.shortname' hidden></eg-grid-field>
   <eg-grid-field label="[% l('Renewals Remaining') %]" path='renewal_remaining'></eg-grid-field>
   <eg-grid-field label="[% l('Fines Stopped') %]" path='stop_fines'></eg-grid-field>

-----------------------------------------------------------------------

Summary of changes:
 Open-ILS/src/templates/staff/circ/patron/t_bill_history_payments.tt2 | 5 ++++-
 Open-ILS/src/templates/staff/circ/patron/t_bill_history_xacts.tt2    | 4 ++++
 Open-ILS/src/templates/staff/circ/patron/t_items_out.tt2             | 2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
Evergreen ILS