[open-ils-commits] [GIT] Evergreen ILS branch master updated. 56ab0960ed7a5a389cb57dacee7b72d8cff810ee

[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  56ab0960ed7a5a389cb57dacee7b72d8cff810ee (commit)
      from  ebce79a288b6a597d5b871379de3b714d2196c5e (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 56ab0960ed7a5a389cb57dacee7b72d8cff810ee
Author: Bill Erickson <berick at esilibrary.com>
Date:   Fri Nov 11 15:25:49 2011 -0500

    tpac; honor password reset matching email setting
    
    If the "circ.password_reset_request_requires_matching_email" org unit
    setting is enable, prompt the user to enter the email address associated
    with the account and subsequently pass it on to the password_reset api
    call.
    
    Signed-off-by: Bill Erickson <berick at esilibrary.com>
    Signed-off-by: Mike Rylander <mrylander at gmail.com>

diff --git a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Account.pm b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Account.pm
index f14a200..fdbb3e3 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Account.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Account.pm
@@ -1738,6 +1738,7 @@ sub load_password_reset {
     } elsif ($barcode or $username) {
 
         my @params = $barcode ? ('barcode', $barcode) : ('username', $username);
+        push(@params, $email) if $email;
 
         $U->simplereq(
             'open-ils.actor', 
diff --git a/Open-ILS/src/templates/opac/password_reset.tt2 b/Open-ILS/src/templates/opac/password_reset.tt2
index b0533ac..144678e 100644
--- a/Open-ILS/src/templates/opac/password_reset.tt2
+++ b/Open-ILS/src/templates/opac/password_reset.tt2
@@ -61,7 +61,9 @@
                     <td><input type="text" id="username" name="username"/></td>
                 </tr>
             </table>
-            <!--<label for="email">[% l('Email address associated with the account:') %] </label><input type="text" name="email"/></br>-->
+            [% IF ctx.get_org_setting(ctx.physical_loc || ctx.aou_tree.id, 'circ.password_reset_request_requires_matching_email') %]
+            <label for="email">[% l('Email address associated with the account:') %] </label><input type="text" name="email"/></br>
+            [% END %]
             <button name="submit" id="submitButton" type="submit">[% l('Submit') %]</button>
         </form>
         [% END %]

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

Summary of changes:
 .../lib/OpenILS/WWW/EGCatLoader/Account.pm         |    1 +
 Open-ILS/src/templates/opac/password_reset.tt2     |    4 +++-
 2 files changed, 4 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
Evergreen ILS