[open-ils-commits] [GIT] Evergreen ILS branch rel_3_1 updated. e46332db715b919ec339d3bfae423d73996fca89

Evergreen Git git at git.evergreen-ils.org
Wed May 29 11:13:32 EDT 2019


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  e46332db715b919ec339d3bfae423d73996fca89 (commit)
       via  ff62a98d0459aef0e3fe0b03c8e997d784255804 (commit)
      from  c03bea253077c87ff6c6812cad23d034d9a81679 (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 e46332db715b919ec339d3bfae423d73996fca89
Author: Bill Erickson <berickxx at gmail.com>
Date:   Fri Mar 8 10:38:43 2019 -0500

    LP1748265 Hold fetch API sms_carrier option
    
    Support a new "include_sms_carrier" option to the holds retrieve API so
    the data may be fetched along with the hold instead after the fact in
    the patron holds list, etc.
    
    Signed-off-by: Bill Erickson <berickxx at gmail.com>
    Signed-off-by: Garry Collum <gcollum at gmail.com>
    Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>

diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Holds.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Holds.pm
index 39c4d16255..613ee8d7c8 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Holds.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Holds.pm
@@ -3387,6 +3387,7 @@ sub uber_hold_impl {
     my $flesh_fields = ['current_copy', 'usr', 'notes'];
     push (@$flesh_fields, 'requestor') if $args->{include_requestor};
     push (@$flesh_fields, 'cancel_cause') if $args->{include_cancel_cause};
+    push (@$flesh_fields, 'sms_carrier') if $args->{include_sms_carrier};
 
     my $hold = $e->retrieve_action_hold_request([
         $hold_id,

commit ff62a98d0459aef0e3fe0b03c8e997d784255804
Author: Garry Collum <gcollum at gmail.com>
Date:   Sun Jun 3 15:54:25 2018 -0400

    LP#1748265 SMS Carrier not an option in the patron's list of holds.
    
    Adds SMS Carrier name as an option in the patron's list of holds.
    
    To test:
    1. Set 'Enable features that send SMS text messages' in the Library Settings to true.
    2. Place a few holds for a patron, selecting text message notification.
    3. Go to the patron's record and view their holds.
    4. Display the 'Notifications SMS Carrier' column to view the carrier name.
    
    Signed-off-by: Garry Collum <gcollum at gmail.com>
    Signed-off-by: Dawn Dale <ddale at georgialibraries.org>
    Signed-off-by: Bill Erickson <berickxx at gmail.com>
    Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>

diff --git a/Open-ILS/src/templates/staff/circ/patron/t_holds_list.tt2 b/Open-ILS/src/templates/staff/circ/patron/t_holds_list.tt2
index 9c8962e31a..0b36120d89 100644
--- a/Open-ILS/src/templates/staff/circ/patron/t_holds_list.tt2
+++ b/Open-ILS/src/templates/staff/circ/patron/t_holds_list.tt2
@@ -84,6 +84,7 @@
   <eg-grid-field path='hold.usr.family_name' parent-idl-class="ahr" label="[% l('Last Name') %]" hidden></eg-grid-field>
   <eg-grid-field path='hold.requestor.id' parent-idl-class="ahr" label="[% l('Requestor ID') %]" hidden></eg-grid-field>
   <eg-grid-field path='hold.requestor.usrname' parent-idl-class="ahr" label="[% l('Requestor Username') %]" hidden></eg-grid-field>
+  <eg-grid-field path='hold.sms_carrier.name' parent-idl-class="ahr" label="[% l('Notifications SMS Carrier') %]" hidden></eg-grid-field>
 
   <eg-grid-field path='part.label' parent-idl-class="bmp" label="[% l('Part') %]" hidden></eg-grid-field>
   <eg-grid-field path='volume.*' parent-idl-class="acn" hidden></eg-grid-field>
diff --git a/Open-ILS/web/js/ui/default/staff/circ/services/holds.js b/Open-ILS/web/js/ui/default/staff/circ/services/holds.js
index 7507a764be..2faab7de80 100644
--- a/Open-ILS/web/js/ui/default/staff/circ/services/holds.js
+++ b/Open-ILS/web/js/ui/default/staff/circ/services/holds.js
@@ -37,6 +37,7 @@ function($uibModal , $q , egCore , egConfirmDialog , egAlertDialog) {
                     include_current_copy : true,
                     include_usr          : true,
                     include_cancel_cause : true,
+                    include_sms_carrier  : true,
                     include_requestor    : true
                 }
 
@@ -478,6 +479,11 @@ function($uibModal , $q , egCore , egConfirmDialog , egAlertDialog) {
             egCore.pcrud.retrieve('au',hold.usr()).then(function(u) { hold.usr(u) });
         }
 
+        if (hold.sms_carrier() && typeof hold.sms_carrier() != 'object') {
+            console.debug('fetching sms carrier');
+            egCore.pcrud.retrieve('csc',hold.sms_carrier()).then(function(c) { hold.sms_carrier(c) });
+        }
+
         // current_copy is not always fleshed in the API
         if (hold.current_copy() && typeof hold.current_copy() != 'object') {
             hold.current_copy(hold_data.copy);
@@ -684,6 +690,7 @@ function($window , $location , $timeout , egCore , egHolds , egCirc) {
                             include_current_copy : true,
                             include_usr          : true,
                             include_cancel_cause : true,
+                            include_sms_carrier  : true,
                             include_requestor    : true
                         }
                     ).then(function(hold_data) { 

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

Summary of changes:
 Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Holds.pm | 1 +
 Open-ILS/src/templates/staff/circ/patron/t_holds_list.tt2   | 1 +
 Open-ILS/web/js/ui/default/staff/circ/services/holds.js     | 7 +++++++
 3 files changed, 9 insertions(+)


hooks/post-receive
-- 
Evergreen ILS


More information about the open-ils-commits mailing list