X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=server%2Fcompbio%2Fcontrollers%2FUserController.java;fp=server%2Fcompbio%2Fcontrollers%2FUserController.java;h=3c922b24fb13752d4efff40f675120ad50fb7633;hb=9bb6ee99ca7f738fac1087190b5481b8fe6e8d9f;hp=a00bd15ebafc5c05f9ddc3d0e9c4627ec97f088b;hpb=2e3f6b76be585306f1003d849831840c0adb3360;p=proteocache.git

diff --git a/server/compbio/controllers/UserController.java b/server/compbio/controllers/UserController.java
index a00bd15..3c922b2 100644
--- a/server/compbio/controllers/UserController.java
+++ b/server/compbio/controllers/UserController.java
@@ -5,8 +5,6 @@ import java.util.regex.Pattern;
 
 import javax.naming.directory.DirContext;
 
-import org.springframework.ldap.core.LdapTemplate;
-import org.springframework.security.ldap.userdetails.DefaultLdapAuthoritiesPopulator;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.dao.DataIntegrityViolationException;
 import org.springframework.mail.SimpleMailMessage;
@@ -26,8 +24,13 @@ import compbio.proteocache.users.User;
 import compbio.proteocache.users.UserManager;
 import compbio.cassandra.CassandraUserManager;
 
+/**
+ * @author Alexander Sherstnev
+ * @author Natasha Sherstneva
+ * @version 1.0 Dec 2013
+ */
 @Controller
-public class UserController {
+public class UserController extends BasicController {
 
 	@Autowired
 	ContextSource contextSource;
@@ -35,7 +38,7 @@ 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.POST)
+	@RequestMapping(value = "/register/query", method = RequestMethod.GET)
 	public String RegisterForm(ModelMap model) {
 		User user = new User();
 		model.addAttribute(user);
@@ -44,14 +47,14 @@ public class UserController {
 
 	@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";
+		model.put("username", getPrincipalName());
+		/*
+		 * 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";
+		 */
+		return "support/Notimplemented";
 	}
 
 	@RequestMapping(value = "/register/do", method = RequestMethod.POST)
@@ -91,7 +94,7 @@ public class UserController {
 		}
 
 		user.setRegistrationDate(new Date());
-		UserManager cm = new CassandraUserManager();
+		CassandraUserManager cm = new CassandraUserManager();
 		try {
 			cm.addUser(user);
 		} catch (DataIntegrityViolationException e) {