1. Move query jsps into a separate directory

[proteocache.git] / server / compbio / controllers / UserController.java

diff --git a/server/compbio/controllers/UserController.java b/server/compbio/controllers/UserController.java
index 513f5bb..7dbfdf4 100644 (file)
--- a/server/compbio/controllers/UserController.java
+++ b/server/compbio/controllers/UserController.java
@@ -1,6 +1,5 @@
 package compbio.controllers;
 
-import java.security.Principal;
 import java.util.Date;
 import java.util.regex.Pattern;
 
@@ -28,13 +27,25 @@ public class UserController {
        // JavaMailSender mailSender;
        private final Pattern EMAIL = Pattern.compile("[A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\\.[A-Za-z]{2,4}");
 
-       @RequestMapping(value = "/register/query", method = RequestMethod.GET)
-       public String printPublicHome(ModelMap model) {
+       @RequestMapping(value = "/register/query", method = RequestMethod.POST)
+       public String RegisterForm(ModelMap model) {
                User user = new User();
                model.addAttribute(user);
                return "Register";
        }
 
+       @RequestMapping(value = "/register/edit/query", method = RequestMethod.GET)
+       public String AccountForm(ModelMap model) {
+               User user = new User();
+               user.setFullName("Sasha Sherstnev");
+               user.setEmail("admin@admin.com");
+               user.setOrganisation("UoD");
+               user.setPosition("cleaner");
+               user.setUpdateByEmail(true);
+               model.addAttribute("u", user);
+               return "Edit";
+       }
+
        @RequestMapping(value = "/register/do", method = RequestMethod.POST)
        public String addUser(Model model, @ModelAttribute("user") User user, BindingResult bindingResult) {