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

[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_1 has been updated
       via  7ef837be308ab256f4ff3459945559047d0e8393 (commit)
       via  5e759d55e3555f0930833cdc7fefb4c03755b8ea (commit)
      from  311073d34fdc63906f8f7d57e580a7ad032d2e8a (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 7ef837be308ab256f4ff3459945559047d0e8393
Author: Bill Erickson <berickxx at gmail.com>
Date:   Thu Mar 29 17:06:16 2018 -0400

    LP#1729934 Webstaff display org-scoped penalties
    
    Consistent with the XUL client, only display patron standing penalties
    (AKA Messages) that are linked to an org unit which is an ancestor,
    matching, or descendant org unit of the workstation (e.g. the full
    path).
    
    To test:
    
    [1] Create a patron Message which applies to a branch using a branch or
    null-depth penalty (e.g. at BR1).
    
    [2] Create a second message that links to the root org unit (e.g. CONS)
    via depth=0 penalty.
    
    [2] Log out and back in to the browser client at a workstation under a
    different section of the org unit tree (e.g. BR3) and confirm the
    Messages created at BR1 do not display, but the messages created at CONS
    do.
    
    Signed-off-by: Bill Erickson <berickxx at gmail.com>
    Signed-off-by: Kathy Lussier <klussier at masslnc.org>

diff --git a/Open-ILS/web/js/ui/default/staff/circ/patron/app.js b/Open-ILS/web/js/ui/default/staff/circ/patron/app.js
index 580b430..fa8a60e 100644
--- a/Open-ILS/web/js/ui/default/staff/circ/patron/app.js
+++ b/Open-ILS/web/js/ui/default/staff/circ/patron/app.js
@@ -710,6 +710,7 @@ function($scope,  $q,  $routeParams,  $timeout,  $window,  $location,  egCore ,
 function($scope , $q , $routeParams,  egCore , $uibModal , patronSvc , egCirc) {
     $scope.initTab('messages', $routeParams.id);
     var usr_id = $routeParams.id;
+    var org_ids = egCore.org.fullPath(egCore.auth.user().ws_ou(), true);
 
     // setup date filters
     var start = new Date(); // now - 1 year
@@ -736,6 +737,7 @@ function($scope , $q , $routeParams,  egCore , $uibModal , patronSvc , egCirc) {
         setQuery : function() {
             return {
                 usr : usr_id,
+                org_unit : org_ids,
                 '-or' : [
                     {stop_date : null},
                     {stop_date : {'>' : 'now'}}
@@ -751,6 +753,7 @@ function($scope , $q , $routeParams,  egCore , $uibModal , patronSvc , egCirc) {
         setQuery : function() {
             return {
                 usr : usr_id, 
+                org_unit : org_ids,
                 stop_date : {'<=' : 'now'},
                 set_date : {between : date_range()}
             };

commit 5e759d55e3555f0930833cdc7fefb4c03755b8ea
Author: Bill Erickson <berickxx at gmail.com>
Date:   Fri Jan 5 14:55:56 2018 -0500

    LP#1729934 Webstaff penalty create org/depth repair
    
    Apply correct org unit to patron penalties created in the web staff
    client.  Specifically, be sure the standing penalty depth value is
    honored when set.
    
    Commit replaces manual pcrud creation with the XUL-tested API, which
    calculates the correct org unit by depth for us.
    
    Signed-off-by: Bill Erickson <berickxx at gmail.com>
    Signed-off-by: Cesar Velez <cesar.velez at equinoxinitiative.org>
    Signed-off-by: Kathy Lussier <klussier at masslnc.org>

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 5a903c7..ec97c30 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
@@ -1930,7 +1930,12 @@ function($uibModal , $q , egCore , egAlertDialog , egConfirmDialog,  egAddCopyAl
                 }
                 pen.staff(egCore.auth.user().id());
                 pen.set_date('now');
-                return egCore.pcrud.create(pen);
+
+                return egCore.net.request(
+                    'open-ils.actor',
+                    'open-ils.actor.user.penalty.apply',
+                    egCore.auth.token(), pen
+                );
             }
         );
     }

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

Summary of changes:
 .../web/js/ui/default/staff/circ/patron/app.js     |    3 +++
 .../web/js/ui/default/staff/circ/services/circ.js  |    7 ++++++-
 2 files changed, 9 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
Evergreen ILS