From 0a78ab5687d85ec443968549dcc3f9cf3d2aea4d Mon Sep 17 00:00:00 2001
From: Tim Worrall <tlw72@cornell.edu>
Date: Fri, 27 Mar 2015 16:05:42 -0400
Subject: [PATCH] VIVO-919 and VIVO-1007: added the max password length to
 login widget class and also corrected the variable reference in the template
 for the minimum length (was minimumLength not minimumPasswordLength).

---
 .../cornell/mannlib/vitro/webapp/web/widgets/LoginWidget.java | 4 +++-
 webapp/web/templates/freemarker/widgets/widget-login.ftl      | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/widgets/LoginWidget.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/widgets/LoginWidget.java
index 83ded4a02..347089b2e 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/widgets/LoginWidget.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/widgets/LoginWidget.java
@@ -58,7 +58,8 @@ public class LoginWidget extends Widget {
         EXTERNAL_AUTH_URL("externalAuthUrl"),
         CANCEL_URL("cancelUrl"),
         SITE_NAME("siteName"),
-        MINIMUM_PASSWORD_LENGTH("minimumPasswordLength");
+        MINIMUM_PASSWORD_LENGTH("minimumPasswordLength"),
+    	MAXIMUM_PASSWORD_LENGTH("maximumPasswordLength");
 
         private final String variableName;
         
@@ -173,6 +174,7 @@ public class LoginWidget extends Widget {
         values.put(TemplateVariable.FORM_ACTION.toString(), getAuthenticateUrl(request));
         values.put(TemplateVariable.CANCEL_URL.toString(), getCancelUrl(request));
         values.put(TemplateVariable.MINIMUM_PASSWORD_LENGTH.toString(), UserAccount.MIN_PASSWORD_LENGTH);
+        values.put(TemplateVariable.MAXIMUM_PASSWORD_LENGTH.toString(), UserAccount.MAX_PASSWORD_LENGTH);
 
         String errorMessage = bean.getErrorMessageAndClear();
         if (!errorMessage.isEmpty()) {
diff --git a/webapp/web/templates/freemarker/widgets/widget-login.ftl b/webapp/web/templates/freemarker/widgets/widget-login.ftl
index d2b3a568c..855966762 100644
--- a/webapp/web/templates/freemarker/widgets/widget-login.ftl
+++ b/webapp/web/templates/freemarker/widgets/widget-login.ftl
@@ -90,7 +90,7 @@
                 <label for="newPassword">${i18n().new_password_capitalized}</label>
                 <input id="newPassword" name="newPassword" class="text-field focus" type="password" required autofocus/>
                 
-                <p class="password-note">${i18n().minimum_password_length(minimumLength, maximumLength)}</p>
+                <p class="password-note">${i18n().minimum_password_length(minimumPasswordLength, maximumPasswordLength)}</p>
                 
                 <label for="confirmPassword">${i18n().confirm_password_capitalized}</label>
                 <input id="confirmPassword" name="confirmPassword" class="text-field" type="password" required />