Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/OrgPasswordChangeAction.java =================================================================== diff -u -rccae5ec14269c8b244a2d0af05bc0050483fbfeb -ra941eded2cb9a388fe1952eb1f5688d5cae694c7 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/OrgPasswordChangeAction.java (.../OrgPasswordChangeAction.java) (revision ccae5ec14269c8b244a2d0af05bc0050483fbfeb) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/OrgPasswordChangeAction.java (.../OrgPasswordChangeAction.java) (revision a941eded2cb9a388fe1952eb1f5688d5cae694c7) @@ -32,7 +32,10 @@ import org.apache.struts.action.ActionMapping; import org.apache.struts.action.DynaActionForm; import org.apache.struts.actions.DispatchAction; +import org.lamsfoundation.lams.admin.service.AdminServiceProxy; import org.lamsfoundation.lams.integration.security.RandomPasswordGenerator; +import org.lamsfoundation.lams.usermanagement.Organisation; +import org.lamsfoundation.lams.usermanagement.service.IUserManagementService; import org.lamsfoundation.lams.util.WebUtil; import org.lamsfoundation.lams.web.util.AttributeNames; @@ -46,8 +49,13 @@ Integer organisationID = WebUtil.readIntParam(request, AttributeNames.PARAM_ORGANISATION_ID); DynaActionForm passForm = (DynaActionForm) form; passForm.set(AttributeNames.PARAM_ORGANISATION_ID, organisationID); + IUserManagementService userManagementService = AdminServiceProxy.getService(getServlet().getServletContext()); + Organisation organisation = (Organisation) userManagementService.findById(Organisation.class, organisationID); + passForm.set(AttributeNames.PARAM_ORGANISATION_NAME, organisation.getName()); + passForm.set("staffPass", RandomPasswordGenerator.nextPasswordValidated()); passForm.set("learnerPass", RandomPasswordGenerator.nextPasswordValidated()); + return mapping.findForward("start"); } } Index: lams_admin/web/WEB-INF/struts-config.xml =================================================================== diff -u -rccae5ec14269c8b244a2d0af05bc0050483fbfeb -ra941eded2cb9a388fe1952eb1f5688d5cae694c7 --- lams_admin/web/WEB-INF/struts-config.xml (.../struts-config.xml) (revision ccae5ec14269c8b244a2d0af05bc0050483fbfeb) +++ lams_admin/web/WEB-INF/struts-config.xml (.../struts-config.xml) (revision a941eded2cb9a388fe1952eb1f5688d5cae694c7) @@ -162,6 +162,7 @@ + Index: lams_admin/web/orgPasswordChange.jsp =================================================================== diff -u -rccae5ec14269c8b244a2d0af05bc0050483fbfeb -ra941eded2cb9a388fe1952eb1f5688d5cae694c7 --- lams_admin/web/orgPasswordChange.jsp (.../orgPasswordChange.jsp) (revision ccae5ec14269c8b244a2d0af05bc0050483fbfeb) +++ lams_admin/web/orgPasswordChange.jsp (.../orgPasswordChange.jsp) (revision a941eded2cb9a388fe1952eb1f5688d5cae694c7) @@ -22,6 +22,9 @@ .changeContainer .fa { cursor: pointer; } + h3 { + text-align: center; + } <%-- javascript --%> @@ -109,6 +112,7 @@
+

: