# HG changeset patch
# User Marcin Kuzminski <marcin@python-works.com>
# Date 2012-07-12 15:14:59
# Node ID 6c83dc0226d26926c31213bdbb73981dab4f6b00
# Parent  3a54e1e121d58b6e71d2e0b1858d3d91016f6223

renamed some leftover name -> firstname

diff --git a/rhodecode/model/forms.py b/rhodecode/model/forms.py
--- a/rhodecode/model/forms.py
+++ b/rhodecode/model/forms.py
@@ -151,7 +151,7 @@ def RegisterForm(edit=False, old_data={}
             v.UnicodeString(strip=False, min=6, not_empty=True)
         )
         active = v.StringBoolean(if_missing=False)
-        name = v.UnicodeString(strip=True, min=1, not_empty=False)
+        firstname = v.UnicodeString(strip=True, min=1, not_empty=False)
         lastname = v.UnicodeString(strip=True, min=1, not_empty=False)
         email = All(v.Email(not_empty=True), v.UniqSystemEmail(old_data))
 
diff --git a/rhodecode/templates/admin/users/user_add.html b/rhodecode/templates/admin/users/user_add.html
--- a/rhodecode/templates/admin/users/user_add.html
+++ b/rhodecode/templates/admin/users/user_add.html
@@ -56,10 +56,10 @@
 
              <div class="field">
                 <div class="label">
-                    <label for="name">${_('First Name')}:</label>
+                    <label for="firstname">${_('First Name')}:</label>
                 </div>
                 <div class="input">
-                    ${h.text('name',class_='small')}
+                    ${h.text('firstname',class_='small')}
                 </div>
              </div>
 
diff --git a/rhodecode/templates/register.html b/rhodecode/templates/register.html
--- a/rhodecode/templates/register.html
+++ b/rhodecode/templates/register.html
@@ -44,10 +44,10 @@
 
 	             <div class="field">
 	                <div class="label">
-	                    <label for="name">${_('First Name')}:</label>
+	                    <label for="firstname">${_('First Name')}:</label>
 	                </div>
 	                <div class="input">
-	                    ${h.text('name',class_="medium")}
+	                    ${h.text('firstname',class_="medium")}
 	                </div>
 	             </div>
 
diff --git a/rhodecode/tests/functional/test_login.py b/rhodecode/tests/functional/test_login.py
--- a/rhodecode/tests/functional/test_login.py
+++ b/rhodecode/tests/functional/test_login.py
@@ -85,7 +85,7 @@ class TestLoginController(TestController
                                              'password': 'test12',
                                              'password_confirmation': 'test12',
                                              'email': 'goodmail@domain.com',
-                                             'name': 'test',
+                                             'firstname': 'test',
                                              'lastname': 'test'})
 
         msg = validators.ValidUsername()._messages['username_exists']
@@ -98,7 +98,7 @@ class TestLoginController(TestController
                                              'password': 'test12',
                                              'password_confirmation': 'test12',
                                              'email': 'test_admin@mail.com',
-                                             'name': 'test',
+                                             'firstname': 'test',
                                              'lastname': 'test'})
 
         msg = validators.UniqSystemEmail()()._messages['email_taken']
@@ -110,7 +110,7 @@ class TestLoginController(TestController
                                              'password': 'test12',
                                              'password_confirmation': 'test12',
                                              'email': 'TesT_Admin@mail.COM',
-                                             'name': 'test',
+                                             'firstname': 'test',
                                              'lastname': 'test'})
         msg = validators.UniqSystemEmail()()._messages['email_taken']
         response.mustcontain(msg)
@@ -121,7 +121,7 @@ class TestLoginController(TestController
                                              'password': 'test',
                                              'password_confirmation': 'test',
                                              'email': 'goodmailm',
-                                             'name': 'test',
+                                             'firstname': 'test',
                                              'lastname': 'test'})
         self.assertEqual(response.status, '200 OK')
         response.mustcontain('An email address must contain a single @')
@@ -133,7 +133,7 @@ class TestLoginController(TestController
                                              'password': 'test12',
                                              'password_confirmation': 'test12',
                                              'email': 'goodmailm',
-                                             'name': 'test',
+                                             'firstname': 'test',
                                              'lastname': 'test'})
 
         response.mustcontain('An email address must contain a single @')
@@ -149,7 +149,7 @@ class TestLoginController(TestController
                                              'password': 'test12',
                                              'password_confirmation': 'test12',
                                              'email': 'goodmailm',
-                                             'name': 'test',
+                                             'firstname': 'test',
                                              'lastname': 'test'})
 
         response.mustcontain('An email address must contain a single @')
@@ -163,7 +163,7 @@ class TestLoginController(TestController
                                          'password': 'ąćźżąśśśś',
                                          'password_confirmation': 'ąćźżąśśśś',
                                          'email': 'goodmailm@test.plx',
-                                         'name': 'test',
+                                         'firstname': 'test',
                                          'lastname': 'test'})
 
         msg = validators.ValidPassword()._messages['invalid_password']
@@ -175,7 +175,7 @@ class TestLoginController(TestController
                                              'password': '123qwe',
                                              'password_confirmation': 'qwe123',
                                              'email': 'goodmailm@test.plxa',
-                                             'name': 'test',
+                                             'firstname': 'test',
                                              'lastname': 'test'})
         msg = validators.ValidPasswordsMatch()._messages['password_mismatch']
         response.mustcontain(msg)
@@ -192,7 +192,7 @@ class TestLoginController(TestController
                                              'password': password,
                                              'password_confirmation': password,
                                              'email': email,
-                                             'name': name,
+                                             'firstname': name,
                                              'lastname': lastname,
                                              'admin': True})  # This should be overriden
         self.assertEqual(response.status, '302 Found')