user registration

Author: dshao

pegr/grails-app/controllers/pegr/UserController.groovy

@@ -107,7 +107,7 @@ class UserController {
 
     def selfRegister(User user) {
         try {
-            userService.create(user.email, [], false, user.fullName)
+            userService.create(user.username, user.email, [], false, user.fullName)
             flash.message = "You have registered with PEGR. Please login."
         } catch (UserException e) {
             flash.error = e.message            

pegr/grails-app/controllers/pegr/admin/UserAdminController.groovy

@@ -168,7 +168,9 @@ class UserAdminController {
             return
         }
         try {
-            def user = userService.create(cmd.email,
+            def user = userService.create(
+                            cmd.email,
+                            cmd.email,
                             groupIds,
                             cmd.sendEmail
                             )

pegr/grails-app/services/pegr/UserService.groovy

@@ -56,12 +56,11 @@ class UserService {
     }
 
     @Transactional
-    def create(String email, List groupIds, Boolean sendEmail, String fullName=null){
+    def create(String username, String email, List groupIds, Boolean sendEmail, String fullName=null){
         if(User.findByEmail(email)) {
             throw new UserException(message: "Email has already been used!")
         }
-        
-        def username = email
+
         if (User.findByUsername(username)) {
             throw new UserException(message: "Username ${username} has already been registered with PEGR!")
         }   

pegr/grails-app/views/login/auth.gsp

@@ -47,6 +47,8 @@
                     <div class="form-group">
                         <label for="fullName">Full Name </label> 
                         <g:textField class="form-control" name="fullName" value="${fullName}" placeholder="Enter Full Name"/>
+                        <label for="username">Username </label> 
+                        <g:textField class="form-control" name="username" value="${username}" placeholder="Enter Username"/>
                         <label for="email">Email </label> 
                         <g:textField class="form-control" name="email" value="${email}" placeholder="Enter Email"/>
                     </div>