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

[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  ebdf2f7b5f6005952a75cc2ca9772ab31d437ae3 (commit)
       via  b4090249374f07ea931116fc6a0e905b1e2f3433 (commit)
      from  687da46854a5ef887e97363713d814c5750a6c1e (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 ebdf2f7b5f6005952a75cc2ca9772ab31d437ae3
Author: Galen Charlton <gmc at equinoxinitiative.org>
Date:   Wed Apr 5 18:39:14 2017 -0400

    LP#1641708: follow-up - only record hold_id when logging hold placement
    
    Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
    Signed-off-by: Kathy Lussier <klussier at masslnc.org>

diff --git a/Open-ILS/web/js/ui/default/staff/services/ui.js b/Open-ILS/web/js/ui/default/staff/services/ui.js
index 6f74605..8a30fca 100644
--- a/Open-ILS/web/js/ui/default/staff/services/ui.js
+++ b/Open-ILS/web/js/ui/default/staff/services/ui.js
@@ -884,6 +884,8 @@ function($window , egStrings) {
             || data.action == 'registered_patron'
             || data.action == 'paid_bill') {
             entry['patron_id'] = data.patron_id;
+        }
+        if (data.action == 'requested_hold') {
             entry['hold_id'] = data.hold_id;
         }
         if (data.action == 'paid_bill') {

commit b4090249374f07ea931116fc6a0e905b1e2f3433
Author: Bill Erickson <berickxx at gmail.com>
Date:   Mon Nov 14 14:36:59 2016 -0500

    LP#1641708 Work log avoid storing unneeded data
    
    Avoid storing full transaction data with each work log entry.  Only
    store data need for work log display and actions.
    
    Includes the addition of a new field (entry.hold_id) for hold requests
    so that the value does not have live in the large data blob.
    
    To test:
    
    1. Peform checkouts, holds placements,  and other log-tracked actions
       in the client.
    2. Open Administration -> Workstation -> Stored Preferences and see
       values for key "eg.patron_log".  Values added after the patch will only
       contain ~8 keys with string values, no large nested objects.
    3. Open Administration -> Local Administration -> Work Log and confirm
       recent log-tracked actions are all represented in the grid.
    
    Signed-off-by: Bill Erickson <berickxx at gmail.com>
    Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
    Signed-off-by: Kathy Lussier <klussier at masslnc.org>

diff --git a/Open-ILS/web/js/ui/default/staff/admin/workstation/log.js b/Open-ILS/web/js/ui/default/staff/admin/workstation/log.js
index b2411e2..9ef44f7 100644
--- a/Open-ILS/web/js/ui/default/staff/admin/workstation/log.js
+++ b/Open-ILS/web/js/ui/default/staff/admin/workstation/log.js
@@ -73,7 +73,7 @@ function($scope , $q , $routeParams , $window , $timeout , egCore , egGridDataPr
 
     function fetch_hold(deferred,entry) {
         return egCore.pcrud.search('ahr',
-            { 'id' : entry.data.hold_id }, {
+            { 'id' : entry.hold_id }, {
                 'flesh' : 2,
                 'flesh_fields' : {
                     'ahr' : ['usr','current_copy'],
@@ -92,7 +92,7 @@ function($scope , $q , $routeParams , $window , $timeout , egCore , egGridDataPr
 
     function fetch_patron(deferred,entry) {
         return egCore.pcrud.search('au',
-            { 'id' : entry.data.patron_id }, {}
+            { 'id' : entry.patron_id }, {}
         ).then(
             function(usr) {
                 entry.user = usr.family_name();
diff --git a/Open-ILS/web/js/ui/default/staff/services/ui.js b/Open-ILS/web/js/ui/default/staff/services/ui.js
index 7328e7d..6f74605 100644
--- a/Open-ILS/web/js/ui/default/staff/services/ui.js
+++ b/Open-ILS/web/js/ui/default/staff/services/ui.js
@@ -856,7 +856,6 @@ function($window , egStrings) {
         var entry = {
             'when' : new Date(),
             'msg' : message,
-            'data' : data,
             'action' : data.action,
             'actor' : egCore.auth.user().usrname()
         };
@@ -885,6 +884,7 @@ function($window , egStrings) {
             || data.action == 'registered_patron'
             || data.action == 'paid_bill') {
             entry['patron_id'] = data.patron_id;
+            entry['hold_id'] = data.hold_id;
         }
         if (data.action == 'paid_bill') {
             entry['amount'] = data.total_amount;

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

Summary of changes:
 .../js/ui/default/staff/admin/workstation/log.js   |    4 ++--
 Open-ILS/web/js/ui/default/staff/services/ui.js    |    4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
Evergreen ILS