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

[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  7a6c4d7da0ec5fa1e8babce91d236638660b083e (commit)
      from  5627950266aa33561cad54b69ea47fb8a1d19c09 (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 7a6c4d7da0ec5fa1e8babce91d236638660b083e
Author: Dan Pearl <dpearl at cwmars.org>
Date:   Fri Oct 2 14:54:39 2015 -0400

    LP#1197636 - Email record detail does not check for email
    
    Even though no email was configured, the message shown when requesting
    bib information to be emailed indicated success.  This misleading
    behavior has been addressed by alerting the patron of the situation
    and providing a link to the page where the email address is defined,
    after which the action is automatically retried.
    
    The success message has also been altered slightly to provide
    confirmation of the generated email.
    
    To test:
    
    [1] Create a patron account that does not have an email address.
    [2] In the OPAC, log in as that patron and attempt to email a
        bib record.  A message should display indicating that the
        email can be sent; that message should contain a link to the
        user's account page where they can set their email address.
    [3] After setting the email address, you should then be
        redirected back and the email sent.
    
    Signed-off-by: Dan Pearl <dpearl at cwmars.org>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    Signed-off-by: Ben Shum <ben at evergreener.net>

diff --git a/Open-ILS/src/templates/opac/record/email.tt2 b/Open-ILS/src/templates/opac/record/email.tt2
index d41226c..63520fd 100644
--- a/Open-ILS/src/templates/opac/record/email.tt2
+++ b/Open-ILS/src/templates/opac/record/email.tt2
@@ -8,7 +8,16 @@
     <div id="content-wrapper" class="content-wrapper-record-page">
         <div id='main-content'>
             <br/>
-            <h2 class='success'>[% l('Your email has been queued for Delivery.') %]</h2>
+            [% IF ctx.user.email %]
+            <h2 class='success'>[% l('Your email has been queued for delivery to [_1]', ctx.user.email ) %]</h2>
+            [% ELSE %]
+            <h2 class='error'>
+                [% here_link_text = "<a href=\"${ctx.opac_root}/myopac/update_email?return_to_referer=1\">";
+                   here_link_text = here_link_text _ l("here");
+                   here_link_text = here_link_text _ "</a>";
+                   l('Your account does not currently have an email address set. Set your email address [_1]', here_link_text) %]
+            </h2>
+            [% END %]
             <br/>
             <p>[ <a href="[% mkurl(ctx.opac_root  _ '/record/' _ ctx.bre_id) %]">[% l("Back to Record") %]</a> ]</p>
             <div class="common-full-pad"></div>

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

Summary of changes:
 Open-ILS/src/templates/opac/record/email.tt2 |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
Evergreen ILS