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

[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  c1cec9a95a25935d5f0e97d1c104ef5d093cef7e (commit)
      from  616dc3a884a4f894d0aa38ba4b701b4f2108a447 (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 c1cec9a95a25935d5f0e97d1c104ef5d093cef7e
Author: Dan Wells <dbw2 at calvin.edu>
Date:   Thu Feb 13 11:56:19 2014 -0500

    LP#1526543 Truthiness check for reset_password is flawed
    
    We expect boolean options in config.tt2 to be 'true' or 'false',
    but the code was simple asking 'IF reset_password', which is true
    for either value.
    
    Instead, match on the string (as we do in other places).
    
    To test:
    - Load the stock catalog login page
    - Notice the "Forgot your password?" link staying no matter which way
      'reset_password' is set in config.tt2
    - Apply patch, and change 'reset_password' value in config.tt2 to 'false'
    - RESULT: Password reset link doesn't show up
    
    Signed-off-by: Dan Wells <dbw2 at calvin.edu>
    Signed-off-by: Remington Steed <rjs7 at calvin.edu>
    Signed-off-by: Ben Shum <bshum at biblio.org>

diff --git a/Open-ILS/src/templates/opac/parts/login/form.tt2 b/Open-ILS/src/templates/opac/parts/login/form.tt2
index 9b13f58..88d42c9 100644
--- a/Open-ILS/src/templates/opac/parts/login/form.tt2
+++ b/Open-ILS/src/templates/opac/parts/login/form.tt2
@@ -31,7 +31,7 @@
                 <input id="password_field" name="password" type="password" />
             </div>
             [% INCLUDE "opac/parts/login/password_hint.tt2" %]
-            [% IF reset_password %]
+            [% IF reset_password == 'true' %]
             <a style="font-size: 80%" href='[% mkurl(ctx.opac_root _ '/password_reset', {}, 1) %]'>[% l('Forgot your password?') %]</a>
             [% END %]
         </div>

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

Summary of changes:
 Open-ILS/src/templates/opac/parts/login/form.tt2 |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
Evergreen ILS