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

[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  4b71761afa8da9fdb14a45529adf9d0d64ab554b (commit)
       via  bd60cd16314de1e599fad2d40424c2622bc8006c (commit)
       via  56099a4c595431e0126a7989470186539014a94e (commit)
      from  a2b809e052c9913afde8075207144d40191cee28 (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 4b71761afa8da9fdb14a45529adf9d0d64ab554b
Author: Bill Erickson <berickxx at gmail.com>
Date:   Fri Sep 16 17:16:53 2016 -0400

    LP#1618992 Webstaff checkin UI bib title link repair
    
    Fix bib record title link in browser staff checkin grid so that clicking
    on the link directs the user to the bib record page.
    
    Signed-off-by: Bill Erickson <berickxx at gmail.com>
    Signed-off-by: Jennifer Pringle <jennifer.pringle at bc.libraries.coop>
    Signed-off-by: Kathy Lussier <klussier at masslnc.org>

diff --git a/Open-ILS/src/templates/staff/circ/checkin/t_checkin_table.tt2 b/Open-ILS/src/templates/staff/circ/checkin/t_checkin_table.tt2
index 1ee0c09..c79561f 100644
--- a/Open-ILS/src/templates/staff/circ/checkin/t_checkin_table.tt2
+++ b/Open-ILS/src/templates/staff/circ/checkin/t_checkin_table.tt2
@@ -63,7 +63,7 @@
     path='circ.xact_start'></eg-grid-field>
 
   <eg-grid-field label="[% l('Title') %]" path="title">
-    <a target="_self" href="[% ctx.base_path %]/staff/cat/catalog/record/{{record.doc_id()}}">
+    <a target="_self" href="[% ctx.base_path %]/staff/cat/catalog/record/{{item.record.doc_id()}}">
       {{item.title}}
     </a>
   </eg-grid-field>

commit bd60cd16314de1e599fad2d40424c2622bc8006c
Author: Bill Erickson <berickxx at gmail.com>
Date:   Fri Sep 16 17:15:37 2016 -0400

    LP#1618992 Webstaff checkin error handler repairs
    
    Fix typo in browser staff checkin error handler which resulted in null
    errors any time a checkin failed instead of gracefully handling the
    error.
    
    Signed-off-by: Bill Erickson <berickxx at gmail.com>
    Signed-off-by: Jennifer Pringle <jennifer.pringle at bc.libraries.coop>
    Signed-off-by: Kathy Lussier <klussier at masslnc.org>

diff --git a/Open-ILS/web/js/ui/default/staff/circ/checkin/app.js b/Open-ILS/web/js/ui/default/staff/circ/checkin/app.js
index d0407c6..5428f16 100644
--- a/Open-ILS/web/js/ui/default/staff/circ/checkin/app.js
+++ b/Open-ILS/web/js/ui/default/staff/circ/checkin/app.js
@@ -219,7 +219,7 @@ function($scope , $q , $window , $location , egCore , checkinSvc , egGridDataPro
             angular.forEach(checkinSvc.checkins, function(ci, idx) {
                 if (ci.index == row_item.index) pos = idx;
             });
-            checkinSvc.checkin.splice(pos, 1);
+            checkinSvc.checkins.splice(pos, 1);
 
         })['finally'](function() {
 

commit 56099a4c595431e0126a7989470186539014a94e
Author: Bill Erickson <berickxx at gmail.com>
Date:   Fri Sep 16 17:14:42 2016 -0400

    LP#1618992 Work log checkin/user sanity checks
    
    Avoid attempts to log user information during checkin when no user
    information is available.
    
    Signed-off-by: Bill Erickson <berickxx at gmail.com>
    Signed-off-by: Jennifer Pringle <jennifer.pringle at bc.libraries.coop>
    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 6b4e325..86268d7 100644
--- a/Open-ILS/web/js/ui/default/staff/services/ui.js
+++ b/Open-ILS/web/js/ui/default/staff/services/ui.js
@@ -626,9 +626,11 @@ function($window , egStrings) {
         };
         if (data.action == 'checkin') {
             entry['item'] = data.response.params.copy_barcode;
-            entry['user'] = data.response.data.au.family_name();
             entry['item_id'] = data.response.data.acp.id();
-            entry['patron_id'] = data.response.data.au.id();
+            if (data.response.data.au) {
+                entry['user'] = data.response.data.au.family_name();
+                entry['patron_id'] = data.response.data.au.id();
+            }
         }
         if (data.action == 'checkout') {
             entry['item'] = data.response.params.copy_barcode;

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

Summary of changes:
 .../staff/circ/checkin/t_checkin_table.tt2         |    2 +-
 .../web/js/ui/default/staff/circ/checkin/app.js    |    2 +-
 Open-ILS/web/js/ui/default/staff/services/ui.js    |    6 ++++--
 3 files changed, 6 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
Evergreen ILS