[open-ils-commits] [GIT] Evergreen ILS branch rel_2_12 updated. dfdf3c27d4d4f15f020293b4545e05682539ce40

[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_2_12 has been updated
       via  dfdf3c27d4d4f15f020293b4545e05682539ce40 (commit)
       via  78cb6df0dbda1663804db78c2e3aa2f7d9af1af7 (commit)
      from  4156876612de3802208ec95ce37d4d4b264c2d2d (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 dfdf3c27d4d4f15f020293b4545e05682539ce40
Author: Galen Charlton <gmc at equinoxinitiative.org>
Date:   Mon Apr 24 13:16:21 2017 -0400

    LP#1681466: move text to body of confirm dialog and add title
    
    This patch tweaks the opt-in confirm dialog to add a
    title and move the text to the body of the dialog, making it
    consistent with other dialogs that ask long questions.
    
    Test case for the entire bug fix
    --------------------------------
    [1] Ensure that <opt_in> is set to true in opensrf.xml.
    [2] In the web staff client, open the checkout page
        and do a barcode search for a patron is *not* the
        same system as the workstation that the staff user
        is registered to.
    [3] Verify that a dialog box is presented asking the
        staff user to confirm that personal information can be
        shared with the workstation's library.
    
    Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
    Signed-off-by: Bill Erickson <berickxx at gmail.com>

diff --git a/Open-ILS/src/templates/staff/circ/patron/index.tt2 b/Open-ILS/src/templates/staff/circ/patron/index.tt2
index a0ec497..b017f19 100644
--- a/Open-ILS/src/templates/staff/circ/patron/index.tt2
+++ b/Open-ILS/src/templates/staff/circ/patron/index.tt2
@@ -49,6 +49,7 @@ angular.module('egCoreMod').run(['egStrings', function(s) {
   s.PAYMENT_OVER_MAX = "[% l('Payments over $[_1] are denied by policy.', '{{max_amount}}') %]";
   s.PATRON_NOTE_DELETE_CONFIRM_TITLE = "[% l('Delete Note?') %]";
   s.PATRON_NOTE_DELETE_CONFIRM = "[% l('Delete the note titled \"[_1]\" created on [_2]?', '{{note_title}}', '{{create_date | date}}') %]";
+  s.OPT_IN_DIALOG_TITLE = "[% l('Verify Permission to Share Personal Information') %]";
   s.OPT_IN_DIALOG = "[% l('Does patron [_1], [_2] from [_3] ([_4]) consent to having their personal information shared with your library?', '{{family_name}}', '{{first_given_name}}', '{{org_name}}', '{{org_shortname}}') %]";
 }]);
 </script>
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 2bdc540..02ab395 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
@@ -798,7 +798,8 @@ function($scope , $location , egCore , egConfirmDialog , egUser , patronSvc) {
             .then(function(user) { // retrieve user
                 var org = egCore.org.get(user.home_ou());
                 egConfirmDialog.open(
-                    egCore.strings.OPT_IN_DIALOG, '',
+                    egCore.strings.OPT_IN_DIALOG_TITLE,
+                    egCore.strings.OPT_IN_DIALOG,
                     {   family_name : user.family_name(),
                         first_given_name : user.first_given_name(),
                         org_name : org.name(),

commit 78cb6df0dbda1663804db78c2e3aa2f7d9af1af7
Author: Jeff Davis <jdavis at sitka.bclibraries.ca>
Date:   Wed Apr 19 09:42:38 2017 -0700

    LP#1681466: Text for web client opt-in dialog
    
    Signed-off-by: Jeff Davis <jdavis at sitka.bclibraries.ca>
    Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
    Signed-off-by: Bill Erickson <berickxx at gmail.com>

diff --git a/Open-ILS/src/templates/staff/circ/patron/index.tt2 b/Open-ILS/src/templates/staff/circ/patron/index.tt2
index c1b8196..a0ec497 100644
--- a/Open-ILS/src/templates/staff/circ/patron/index.tt2
+++ b/Open-ILS/src/templates/staff/circ/patron/index.tt2
@@ -49,6 +49,7 @@ angular.module('egCoreMod').run(['egStrings', function(s) {
   s.PAYMENT_OVER_MAX = "[% l('Payments over $[_1] are denied by policy.', '{{max_amount}}') %]";
   s.PATRON_NOTE_DELETE_CONFIRM_TITLE = "[% l('Delete Note?') %]";
   s.PATRON_NOTE_DELETE_CONFIRM = "[% l('Delete the note titled \"[_1]\" created on [_2]?', '{{note_title}}', '{{create_date | date}}') %]";
+  s.OPT_IN_DIALOG = "[% l('Does patron [_1], [_2] from [_3] ([_4]) consent to having their personal information shared with your library?', '{{family_name}}', '{{first_given_name}}', '{{org_name}}', '{{org_shortname}}') %]";
 }]);
 </script>
 
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 7f0e0d8..2bdc540 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
@@ -796,10 +796,13 @@ function($scope , $location , egCore , egConfirmDialog , egUser , patronSvc) {
             egUser.get(user_id, {useFields : []})
 
             .then(function(user) { // retrieve user
+                var org = egCore.org.get(user.home_ou());
                 egConfirmDialog.open(
                     egCore.strings.OPT_IN_DIALOG, '',
-                    {   org : egCore.org.get(user.home_ou()),
-                        user : user,
+                    {   family_name : user.family_name(),
+                        first_given_name : user.first_given_name(),
+                        org_name : org.name(),
+                        org_shortname : org.shortname(),
                         ok : function() { createOptIn(user.id()) },
                         cancel : function() {}
                     }

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

Summary of changes:
 Open-ILS/src/templates/staff/circ/patron/index.tt2 |    2 ++
 .../web/js/ui/default/staff/circ/patron/app.js     |   10 +++++++---
 2 files changed, 9 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
Evergreen ILS