Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/SignupManagementController.java =================================================================== diff -u -r79b6147f263fbc3c92e2db7d98227fa8f7358851 -r7a30f18a459a60eb784a1f15ab1efdecde562972 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/SignupManagementController.java (.../SignupManagementController.java) (revision 79b6147f263fbc3c92e2db7d98227fa8f7358851) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/SignupManagementController.java (.../SignupManagementController.java) (revision 7a30f18a459a60eb784a1f15ab1efdecde562972) @@ -22,67 +22,30 @@ import org.springframework.util.MultiValueMap; import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.context.WebApplicationContext; -import org.springframework.web.context.support.WebApplicationContextUtils; -/** - * - * - * - * - * - * - */ @Controller @RequestMapping("/signupManagement") public class SignupManagementController { private static Logger log = Logger.getLogger(SignupManagementController.class); - private static ISignupService signupService = null; - private static IUserManagementService userManagementService = null; @Autowired - private WebApplicationContext applicationContext; - + @Qualifier("signupService") + private ISignupService signupService = null; + @Autowired + @Qualifier("userManagementService") + private IUserManagementService userManagementService = null; + + @Autowired @Qualifier("adminMessageService") private MessageService adminMessageService; @RequestMapping("/start") - public String execute(@ModelAttribute("signupForm") SignupManagementForm signupForm, HttpServletRequest request, - HttpServletResponse response) { + public String execute(HttpServletRequest request) { + List signupOrganisations = signupService.getSignupOrganisations(); + request.setAttribute("signupOrganisations", signupOrganisations); - try { - if (signupService == null) { - WebApplicationContext wac = WebApplicationContextUtils - .getRequiredWebApplicationContext(applicationContext.getServletContext()); - signupService = (ISignupService) wac.getBean("signupService"); - } - if (userManagementService == null) { - WebApplicationContext wac = WebApplicationContextUtils - .getRequiredWebApplicationContext(applicationContext.getServletContext()); - userManagementService = (IUserManagementService) wac.getBean("userManagementService"); - } - - String action = WebUtil.readStrParam(request, "action", true); - - if (StringUtils.equals(action, "list") || request.getAttribute("CANCEL") != null) { - // do nothing - } else if (StringUtils.equals(action, "edit")) { - return edit(signupForm, request); - } else if (StringUtils.equals(action, "add")) { - return add(signupForm, request); - } else if (StringUtils.equals(action, "delete")) { - return delete(request); - } - - List signupOrganisations = signupService.getSignupOrganisations(); - request.setAttribute("signupOrganisations", signupOrganisations); - } catch (Exception e) { - log.error(e.getMessage(), e); - request.setAttribute("error", e.getMessage()); - } - return "signupmanagement/list"; } @@ -109,7 +72,7 @@ signupForm.setContext(signup.getContext()); request.setAttribute("signupForm", signupForm); - List organisations = signupService.getOrganisationCandidates(); + List organisations = signupService.getOrganisationCandidates(); request.setAttribute("organisations", organisations); return "signupmanagement/add"; @@ -168,21 +131,20 @@ signupForm.setBlurb("Register your LAMS account for this group using the form below."); } - List organisations = signupService.getOrganisationCandidates(); + List organisations = signupService.getOrganisationCandidates(); request.setAttribute("organisations", organisations); return "signupmanagement/add"; } @RequestMapping(path = "/delete") public String delete(HttpServletRequest request) throws Exception { - Integer soid = WebUtil.readIntParam(request, "soid"); if (soid != null && soid > 0) { userManagementService.deleteById(SignupOrganisation.class, soid); } - return "forward:/signupManagement/start.do"; + return "redirect:/signupManagement/start.do"; } } Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/form/SignupManagementForm.java =================================================================== diff -u -r550e1b37b507779064955267ef47e9085f791357 -r7a30f18a459a60eb784a1f15ab1efdecde562972 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/form/SignupManagementForm.java (.../SignupManagementForm.java) (revision 550e1b37b507779064955267ef47e9085f791357) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/form/SignupManagementForm.java (.../SignupManagementForm.java) (revision 7a30f18a459a60eb784a1f15ab1efdecde562972) @@ -36,6 +36,8 @@ private boolean addWithMonitor = false; + private boolean emailVerify = false; + private String courseKey; private String confirmCourseKey; @@ -95,7 +97,15 @@ public void setAddWithMonitor(boolean addWithMonitor) { this.addWithMonitor = addWithMonitor; } + + public boolean getEmailVerify() { + return emailVerify; + } + public void setEmailVerify(boolean emailValidation) { + this.emailVerify = emailValidation; + } + public String getCourseKey() { return courseKey; } Index: lams_admin/web/cleanupPreviewLessons.jsp =================================================================== diff -u -rec30ad2cd8a7b048f296533bcb70fdafd80a3be6 -r7a30f18a459a60eb784a1f15ab1efdecde562972 --- lams_admin/web/cleanupPreviewLessons.jsp (.../cleanupPreviewLessons.jsp) (revision ec30ad2cd8a7b048f296533bcb70fdafd80a3be6) +++ lams_admin/web/cleanupPreviewLessons.jsp (.../cleanupPreviewLessons.jsp) (revision 7a30f18a459a60eb784a1f15ab1efdecde562972) @@ -44,11 +44,12 @@ return; } $.ajax({ - 'cache' : false, 'url' : 'cleanupPreviewLessons/delete.do', 'data' : { 'limit' : 5 }, + type: 'POST', + 'cache' : false, 'success' : function(response){ try { previewCount = response[0]; Index: lams_admin/web/remove.jsp =================================================================== diff -u -r7525e7b5fda723cc9c2c81a78cd8be3785bad851 -r7a30f18a459a60eb784a1f15ab1efdecde562972 --- lams_admin/web/remove.jsp (.../remove.jsp) (revision 7525e7b5fda723cc9c2c81a78cd8be3785bad851) +++ lams_admin/web/remove.jsp (.../remove.jsp) (revision 7a30f18a459a60eb784a1f15ab1efdecde562972) @@ -19,10 +19,10 @@
- + - + @@ -41,13 +41,17 @@

- +
- '" /> - '" /> + +
@@ -62,13 +66,17 @@

  

- - - - + + + +
- '" /> - '" /> + +
Index: lams_admin/web/signupmanagement/add.jsp =================================================================== diff -u -r24ebb6c91f49a10f1e5718036b3a3c1a80c3314f -r7a30f18a459a60eb784a1f15ab1efdecde562972 --- lams_admin/web/signupmanagement/add.jsp (.../add.jsp) (revision 24ebb6c91f49a10f1e5718036b3a3c1a80c3314f) +++ lams_admin/web/signupmanagement/add.jsp (.../add.jsp) (revision 7a30f18a459a60eb784a1f15ab1efdecde562972) @@ -1,17 +1,16 @@ - <%@ include file="/taglibs.jsp"%> ${title} + - - + @@ -50,8 +49,11 @@ : -    - + +    + + + Index: lams_admin/web/user.jsp =================================================================== diff -u -r24ebb6c91f49a10f1e5718036b3a3c1a80c3314f -r7a30f18a459a60eb784a1f15ab1efdecde562972 --- lams_admin/web/user.jsp (.../user.jsp) (revision 24ebb6c91f49a10f1e5718036b3a3c1a80c3314f) +++ lams_admin/web/user.jsp (.../user.jsp) (revision 7a30f18a459a60eb784a1f15ab1efdecde562972) @@ -1,4 +1,4 @@ -bo + <%@ include file="/taglibs.jsp"%> <%@ page import="org.lamsfoundation.lams.util.Configuration"%> Index: lams_admin/web/usersearchlist.jsp =================================================================== diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -r7a30f18a459a60eb784a1f15ab1efdecde562972 --- lams_admin/web/usersearchlist.jsp (.../usersearchlist.jsp) (revision 62aaf160878735888d077bf28fac3c1989bb8fbd) +++ lams_admin/web/usersearchlist.jsp (.../usersearchlist.jsp) (revision 7a30f18a459a60eb784a1f15ab1efdecde562972) @@ -101,7 +101,7 @@ rows += ''; rows += ']'; rows += ' '; - rows += '['; + rows += '['; rows += ''; rows += ']'; rows += ' ';