From 5d66478435668b165ff7e34fe5354c81f302b738 Mon Sep 17 00:00:00 2001
From: Alex Eng <aeng@redhat.com>
Date: Mon, 17 Jun 2013 14:48:58 +1000
Subject: [PATCH] fix password change page - mandatory old password field

---
 .../main/java/org/zanata/action/PasswordChangeAction.java    | 5 ++++-
 zanata-war/src/main/webapp/account/changepassword.xhtml      | 1 +
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/zanata-war/src/main/java/org/zanata/action/PasswordChangeAction.java b/zanata-war/src/main/java/org/zanata/action/PasswordChangeAction.java
index b9a1e14f22..05f5ef4e20 100644
--- a/zanata-war/src/main/java/org/zanata/action/PasswordChangeAction.java
+++ b/zanata-war/src/main/java/org/zanata/action/PasswordChangeAction.java
@@ -62,11 +62,14 @@ public class PasswordChangeAction implements Serializable
    private String passwordNew;
    private String passwordConfirm;
 
+   
    public void setPasswordOld(String passwordOld)
    {
       this.passwordOld = passwordOld;
    }
-
+   
+   @NotEmpty
+   @Size(min = 6, max = 20)
    public String getPasswordOld()
    {
       return passwordOld;
diff --git a/zanata-war/src/main/webapp/account/changepassword.xhtml b/zanata-war/src/main/webapp/account/changepassword.xhtml
index 027fb38426..5d9aa4a5de 100644
--- a/zanata-war/src/main/webapp/account/changepassword.xhtml
+++ b/zanata-war/src/main/webapp/account/changepassword.xhtml
@@ -20,6 +20,7 @@
             <ui:define name="label">#{messages['jsf.OldPassword']}</ui:define>
             <h:inputSecret id="passwordOld" redisplay="true" required="true"
                         value="#{passwordChange.passwordOld}">
+                        <a4j:ajax event="blur" render="passwordOldField"/>
             </h:inputSecret>
         </s:decorate>
         <s:decorate id="passwordNewField" template="../WEB-INF/layout/edit.xhtml" enclose="true">