Index: lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java,v diff -u -r1.54.2.11 -r1.54.2.12 --- lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java 27 Oct 2016 16:53:43 -0000 1.54.2.11 +++ lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java 7 Nov 2016 09:27:16 -0000 1.54.2.12 @@ -112,9 +112,7 @@ return mapping.findForward("editprofile"); } else if (StringUtils.equals(method, "password")) { return mapping.findForward("password"); - } else if (StringUtils.equals(method, "passwordChanged")) { - return mapping.findForward("passwordChanged"); - } else if (StringUtils.equals(method, "portrait")) { + } else if (StringUtils.equals(method, "portrait")) { return mapping.findForward("portrait"); } else if (StringUtils.equals(method, "lessons")) { return mapping.findForward("lessons"); Index: lams_central/src/java/org/lamsfoundation/lams/web/PasswordChangeAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/web/PasswordChangeAction.java,v diff -u -r1.14.2.5 -r1.14.2.6 --- lams_central/src/java/org/lamsfoundation/lams/web/PasswordChangeAction.java 24 Oct 2016 14:55:28 -0000 1.14.2.5 +++ lams_central/src/java/org/lamsfoundation/lams/web/PasswordChangeAction.java 7 Nov 2016 09:27:37 -0000 1.14.2.6 @@ -142,7 +142,7 @@ // If no input page, use error forwarding return (mapping.findForward("error.system")); } - + request.setAttribute("redirectURL",passwordChangeForm.getRedirectURL()); return mapping.findForward("okay"); } Index: lams_central/src/java/org/lamsfoundation/lams/web/PasswordChangeActionForm.java =================================================================== RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/web/PasswordChangeActionForm.java,v diff -u -r1.5.22.3 -r1.5.22.4 --- lams_central/src/java/org/lamsfoundation/lams/web/PasswordChangeActionForm.java 11 May 2016 07:07:58 -0000 1.5.22.3 +++ lams_central/src/java/org/lamsfoundation/lams/web/PasswordChangeActionForm.java 7 Nov 2016 09:27:48 -0000 1.5.22.4 @@ -40,6 +40,8 @@ public class PasswordChangeActionForm extends ActionForm { public static final String formName = "PasswordChangeActionForm"; // must match name in @struts:action section above + + private String redirectURL; private String oldPassword; @@ -123,7 +125,15 @@ public void setOldPassword(String oldPassword) { this.oldPassword = StringUtils.trimToEmpty(oldPassword); } + + public String getRedirectURL() { + return redirectURL; + } + public void setRedirectURL(String redirectURL) { + this.redirectURL = redirectURL; + } + /** * Reset all properties to their default values. * Index: lams_central/web/passwordChangeContent.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/passwordChangeContent.jsp,v diff -u -r1.10.12.7 -r1.10.12.8 --- lams_central/web/passwordChangeContent.jsp 2 Nov 2016 01:09:24 -0000 1.10.12.7 +++ lams_central/web/passwordChangeContent.jsp 7 Nov 2016 09:32:08 -0000 1.10.12.8 @@ -98,9 +98,7 @@ -

-

@@ -114,7 +112,7 @@

-

Index: lams_central/web/passwordChangeOkContent.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/passwordChangeOkContent.jsp,v diff -u -r1.5.22.2 -r1.5.22.3 --- lams_central/web/passwordChangeOkContent.jsp 4 Nov 2016 08:28:09 -0000 1.5.22.2 +++ lams_central/web/passwordChangeOkContent.jsp 7 Nov 2016 09:32:31 -0000 1.5.22.3 @@ -27,7 +27,7 @@

+ href="${empty redirectURL ? 'index.do' : redirectURL}" role="button"> Ok

Index: lams_central/web/profile.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/profile.jsp,v diff -u -r1.23.2.4 -r1.23.2.5 --- lams_central/web/profile.jsp 27 Oct 2016 16:02:36 -0000 1.23.2.4 +++ lams_central/web/profile.jsp 7 Nov 2016 09:32:45 -0000 1.23.2.5 @@ -19,22 +19,21 @@ - +

-

+

-

@@ -73,7 +72,7 @@ Index: lams_central/web/WEB-INF/struts-config.xml =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/WEB-INF/Attic/struts-config.xml,v diff -u -r1.1.2.5 -r1.1.2.6 --- lams_central/web/WEB-INF/struts-config.xml 27 Oct 2016 16:02:36 -0000 1.1.2.5 +++ lams_central/web/WEB-INF/struts-config.xml 7 Nov 2016 09:31:48 -0000 1.1.2.6 @@ -150,11 +150,6 @@ redirect="false" /> - -