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

[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  75e703faff9f6003db91221b70a18dd903521151 (commit)
      from  1a3bb839a9d192ab482cf920fae716341aafa25b (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 75e703faff9f6003db91221b70a18dd903521151
Author: Galen Charlton <gmc at equinoxinitiative.org>
Date:   Fri Mar 23 14:48:02 2018 -0400

    LP#1758360: handle DOB display logic in egPatronSummary correctly
    
    This patch ensures that the patron DOB will be displayed or
    obscured correctly by the standalone egPatronSummary directive
    in the same way that the patron app does.
    
    To test
    -------
    [1] In the web staff client, do a patron search, select two patrons,
        then click the Merge Patrons button.
    [2] Note that the patron DOB is not displayed in the modal.
    [3] Apply the patch and repeat step #1.
    [4] This time, the patron DOB will be displayed (if the
        circ.obscure_dob library setting is not enabled) or the
        the field label will be clickable (and clicking it will
        cause the DOB to be displayed).
    
    Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
    Signed-off-by: Terran McCanna <tmccanna at georgialibraries.org>
    Signed-off-by: Bill Erickson <berickxx at gmail.com>

diff --git a/Open-ILS/web/js/ui/default/staff/circ/services/patrons.js b/Open-ILS/web/js/ui/default/staff/circ/services/patrons.js
index 17a7c7e..5ab2fae 100644
--- a/Open-ILS/web/js/ui/default/staff/circ/services/patrons.js
+++ b/Open-ILS/web/js/ui/default/staff/circ/services/patrons.js
@@ -78,6 +78,24 @@ function($uibModal , $q , egCore) {
                     return user_stats;
                 }
 
+                // show/obscure DOB logic copied from the circ patron app
+                $scope._show_dob = {};
+                $scope.show_dob = function (val) {
+                    if ($scope.patron()) {
+                        if (typeof val != 'undefined') $scope._show_dob[$scope.patron().id()] = val;
+                        return $scope._show_dob[$scope.patron().id()];
+                    }
+                    return !egCore.env.aous['circ.obscure_dob'];
+                }
+
+                $scope.obscure_dob = function() {
+                    return egCore.env.aous && egCore.env.aous['circ.obscure_dob'];
+                }
+                $scope.now_show_dob = function() {
+                    return egCore.env.aous && egCore.env.aous['circ.obscure_dob'] ?
+                        $scope.show_dob() : true;
+                }
+
                 // needed because this directive shares a template with
                 // the patron summary in circ app, but the circ app
                 // displays the patron name elsewhere. 

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

Summary of changes:
 .../js/ui/default/staff/circ/services/patrons.js   |   18 ++++++++++++++++++
 1 files changed, 18 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
Evergreen ILS