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

[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  ec4c7e61f5311c1c4e980a405d8dfe7182638e65 (commit)
      from  5117c42bdc087af778e0d8cae8773c0b35afa2f4 (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 ec4c7e61f5311c1c4e980a405d8dfe7182638e65
Author: Galen Charlton <gmc at equinoxinitiative.org>
Date:   Thu Nov 15 09:59:44 2018 -0500

    LP#1726568: expose circ lib and owning lib fields to spine/pocket labels
    
    This patch fleshes the item circulation library and owning library
    fields so that spine/pocket labels can include the short name or
    full name of the OU rather than just the ID.  As a consequence, the
    following fields are now available for label templates:
    
    * copy['call_number.owning_lib.id']
    * copy['call_number.owning_lib.shortname']
    * copy['call_number.owning_lib.name']
    * copy['circ_lib.id']
    * copy['circ_lib.shortname']
    * copy['circ_lib.name']
    
    If, for some reason, existing label templates intentionally use
    copy['call_number.owning_lib'] or copy['circ_lib'] to include the numeric
    ID of the OU on the label, they will need to be replaced with
    copy['call_number.owning_lib.id'] or copy['circ_lib.id'] respectively.
    
    To test
    -------
    [1] Apply the patch.
    [2] Open the print labels window for an item and try including one
        or more of the new fields listed above; verify that the current
        value is displayed on the label preview.
    
    Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
    Signed-off-by: Terran McCanna <tmccanna at georgialibraries.org>

diff --git a/Open-ILS/src/templates/staff/share/print_templates/t_item_label.tt2 b/Open-ILS/src/templates/staff/share/print_templates/t_item_label.tt2
index 263e1b07ee..3fdd2fc8df 100644
--- a/Open-ILS/src/templates/staff/share/print_templates/t_item_label.tt2
+++ b/Open-ILS/src/templates/staff/share/print_templates/t_item_label.tt2
@@ -120,7 +120,9 @@ HTML itself.
                 copy['call_number.label_class']
                 copy['call_number.label_sortkey']
                 copy['call_number.notes']
-                copy['call_number.owning_lib']
+                copy['call_number.owning_lib.id']
+                copy['call_number.owning_lib.shortname']
+                copy['call_number.owning_lib.name']
                 copy['call_number.prefix.id']
                 copy['call_number.prefix.label']
                 copy['call_number.prefix.label_sortkey']
@@ -170,7 +172,9 @@ HTML itself.
                 copy['call_number.uri_maps']
                 copy['call_number.uris']
                 copy['circ_as_type']
-                copy['circ_lib']
+                copy['circ_lib.id']
+                copy['circ_lib.shortname']
+                copy['circ_lib.name']
                 copy['circ_modifier']
                 copy['circulate']
                 copy['copy_number']
diff --git a/Open-ILS/web/js/ui/default/staff/cat/printlabels/app.js b/Open-ILS/web/js/ui/default/staff/cat/printlabels/app.js
index f6f02da043..28b78d1bde 100644
--- a/Open-ILS/web/js/ui/default/staff/cat/printlabels/app.js
+++ b/Open-ILS/web/js/ui/default/staff/cat/printlabels/app.js
@@ -33,8 +33,8 @@ function(egCore) {
     service.flesh = {   
         flesh : 3, 
         flesh_fields : {
-            acp : ['call_number','location','status','location','floating','circ_modifier','age_protect'],
-            acn : ['record','prefix','suffix'],
+            acp : ['call_number','location','status','location','floating','circ_modifier','age_protect','circ_lib'],
+            acn : ['record','prefix','suffix','owning_lib'],
             bre : ['simple_record','creator','editor']
         },
         select : { 

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

Summary of changes:
 .../src/templates/staff/share/print_templates/t_item_label.tt2    | 8 ++++++--
 Open-ILS/web/js/ui/default/staff/cat/printlabels/app.js           | 4 ++--
 2 files changed, 8 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
Evergreen ILS