Fix problm with username

diff --git a/server/compbio/controllers/UserController.java b/server/compbio/controllers/UserController.java
index 01d24ac..3c922b2 100644 (file)
--- 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";
        }