[open-ils-commits] [GIT] Evergreen ILS branch rel_3_0 updated. fdc827c5deb07da51c3668d923b466759050d519

[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_0 has been updated
       via  fdc827c5deb07da51c3668d923b466759050d519 (commit)
      from  01251ff4d3b410e98e3a2e5e50d24d610c1b1bdb (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 fdc827c5deb07da51c3668d923b466759050d519
Author: Cesar Velez <cesar.velez at equinoxinitiative.org>
Date:   Fri Oct 6 17:57:45 2017 -0400

    LP#1710731 - fix webstaff hold slip and other templates missing call number
    
    Added call number to various dialogs and printtemplates
    that lacked them.
    
    Signed-off by: Cesar Velez <cesar.velez at equinoxinitiative.org>

diff --git a/Open-ILS/src/templates/staff/circ/share/t_hold_shelf_dialog.tt2 b/Open-ILS/src/templates/staff/circ/share/t_hold_shelf_dialog.tt2
index 7fe8a99..8fa2d4b 100644
--- a/Open-ILS/src/templates/staff/circ/share/t_hold_shelf_dialog.tt2
+++ b/Open-ILS/src/templates/staff/circ/share/t_hold_shelf_dialog.tt2
@@ -28,6 +28,10 @@
       <span>[% l('Author:') %]</span>
       <span>{{author}}</span>
     </div>
+    <div>
+      <span>[% l('Call Number:') %]</span>
+      <span>{{call_number.prefix}} {{call_number.label}} {{call_number.suffix}}</span>
+    </div>
     <br/>
     <div>
     
diff --git a/Open-ILS/src/templates/staff/circ/share/t_transit_dialog.tt2 b/Open-ILS/src/templates/staff/circ/share/t_transit_dialog.tt2
index c04a606..771bb17 100644
--- a/Open-ILS/src/templates/staff/circ/share/t_transit_dialog.tt2
+++ b/Open-ILS/src/templates/staff/circ/share/t_transit_dialog.tt2
@@ -40,6 +40,10 @@
         <span>[% l('Author:') %]</span>
         <span>{{author}}</span>
       </div>
+      <div>
+        <span>[% l('Call Number:') %]</span>
+        <span>{{call_number.prefix}} {{call_number.label}} {{call_number.suffix}}</span>
+      </div>
       <div ng-if="patron">
         <br/>
         <div>[% |l %]
diff --git a/Open-ILS/src/templates/staff/share/print_templates/t_hold_shelf_slip.tt2 b/Open-ILS/src/templates/staff/share/print_templates/t_hold_shelf_slip.tt2
index c7ff7c8..2d1a9f7 100644
--- a/Open-ILS/src/templates/staff/share/print_templates/t_hold_shelf_slip.tt2
+++ b/Open-ILS/src/templates/staff/share/print_templates/t_hold_shelf_slip.tt2
@@ -1,6 +1,7 @@
 <!--
 Template for printing hold request slips. Fields include:
 
+* call_number.label/prefix/suffix
 * hold.behind_desk
 * copy.barcode
 * title
@@ -29,6 +30,8 @@ Template for printing hold request slips. Fields include:
 
   [% l('Barcode: [_1]', '{{copy.barcode}}') %]</div>
   [% l('Title: [_1]', '{{title}}') %]</div>
+  <br/>
+  <div>[% l('Call Number: [_1] [_2] [_3]', '{{call_number.prefix}}', '{{call_number.label}}', '{{call_number.suffix}}') %]</div>
 
   <br/>
   <br/>
diff --git a/Open-ILS/web/js/ui/default/staff/circ/services/circ.js b/Open-ILS/web/js/ui/default/staff/circ/services/circ.js
index 13aa2e5..47668be 100644
--- a/Open-ILS/web/js/ui/default/staff/circ/services/circ.js
+++ b/Open-ILS/web/js/ui/default/staff/circ/services/circ.js
@@ -1530,8 +1530,13 @@ function($uibModal , $q , egCore , egAlertDialog , egConfirmDialog,
             var print_context = {
                 copy : egCore.idl.toHash(evt.payload.copy),
                 title : evt.title,
-                author : evt.author
-            }
+                author : evt.author,
+                call_number : egCore.idl.toHash(evt.payload.volume)
+            };
+
+            var acn = print_context.call_number; // fix up pre/suffixes
+            if (acn.prefix == -1) acn.prefix = "";
+            if (acn.suffix == -1) acn.suffix = "";
 
             if (data.transit) {
                 // route_dialog includes the "route to holds shelf" 

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

Summary of changes:
 .../staff/circ/share/t_hold_shelf_dialog.tt2       |    4 ++++
 .../staff/circ/share/t_transit_dialog.tt2          |    4 ++++
 .../share/print_templates/t_hold_shelf_slip.tt2    |    3 +++
 .../web/js/ui/default/staff/circ/services/circ.js  |    9 +++++++--
 4 files changed, 18 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
Evergreen ILS