[open-ils-commits] [GIT] Evergreen ILS branch master updated. a54bc1861cd1bc3001bea77f62b87c7342fa1894

[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, master has been updated
       via  a54bc1861cd1bc3001bea77f62b87c7342fa1894 (commit)
      from  4c8e069b031015f16daeece84364f01933f38d9f (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 a54bc1861cd1bc3001bea77f62b87c7342fa1894
Author: Garry Collum <gcollum at gmail.com>
Date:   Thu Jun 21 19:41:48 2018 -0400

    LP#1778083 Location, Floating, and Age Protect missing from Items Out
    
    Adds columns for Location (Copy), Floating Group, and Age-based Hold
    Protection to the items out grid.
    
    To test.
    1. View an items out screen to see that the Location, Floating Group,
       and Age-based Hold protection columns are not available as options.
    2. Apply the patch.
    3. Edit some items and add definitions for Floating Group, and
       Age-based hold protection.
    4. Check out these items and other items that do not have a floating
       group or age-based protection.
    5. Display the Location, Floating Group, and Age-based Hold Protection
       columns.
    
    Signed-off-by: Garry Collum <gcollum at gmail.com>
    Signed-off-by: Dawn Dale <ddale at georgialibraries.org>
    Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>

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 5a5aee9..7f41136 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
@@ -85,6 +85,9 @@
   <eg-grid-field label="[% l('Checkin Workstation') %]" path='checkin_workstation.name'></eg-grid-field>
   <eg-grid-field label="[% l('Checkout / Renewal Library') %]" path='circ_lib.shortname'></eg-grid-field>
   <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('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>
diff --git a/Open-ILS/web/js/ui/default/staff/circ/patron/items_out.js b/Open-ILS/web/js/ui/default/staff/circ/patron/items_out.js
index e75d9a2..110ead8 100644
--- a/Open-ILS/web/js/ui/default/staff/circ/patron/items_out.js
+++ b/Open-ILS/web/js/ui/default/staff/circ/patron/items_out.js
@@ -108,7 +108,7 @@ function($scope , $q , $routeParams , $timeout , egCore , egUser , patronSvc ,
             {   flesh : 4,
                 flesh_fields : {
                     circ : ['target_copy', 'workstation', 'checkin_workstation'],
-                    acp : ['call_number', 'holds_count', 'status', 'circ_lib'],
+                    acp : ['call_number', 'holds_count', 'status', 'circ_lib', 'location', 'floating', 'age_protect'],
                     acn : ['record', 'owning_lib', 'prefix', 'suffix'],
                     bre : ['wide_display_entry']
                 },

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

Summary of changes:
 .../templates/staff/circ/patron/t_items_out.tt2    |    3 +++
 .../js/ui/default/staff/circ/patron/items_out.js   |    2 +-
 2 files changed, 4 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
Evergreen ILS