From: Sasha Sherstnev <a.sherstnev@dundee.ac.uk>
Date: Fri, 20 Dec 2013 08:29:25 +0000 (+0000)
Subject: Fix problm with username
X-Git-Url: http://source.jalview.org/gitweb/?p=proteocache.git;a=commitdiff_plain;h=30cfdd67dc331a08ff192ae7b82d5a3ae3a8331b

Fix problm with username
---

diff --git a/server/compbio/controllers/UserController.java b/server/compbio/controllers/UserController.java
index 01d24ac..3c922b2 100644
--- a/server/compbio/controllers/UserController.java
+++ b/server/compbio/controllers/UserController.java
@@ -24,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;
@@ -42,16 +47,13 @@ public class UserController {
 
 	@RequestMapping(value = "/register/edit/query", method = RequestMethod.GET)
 	public String AccountForm(ModelMap model) {
+		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";
-		*/
+		 * 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";
 	}