Mercurial > kallithea
changeset 2595:6c83dc0226d2 beta
renamed some leftover name -> firstname
| author | Marcin Kuzminski <marcin@python-works.com> |
|---|---|
| date | Thu, 12 Jul 2012 17:14:59 +0200 |
| parents | 3a54e1e121d5 |
| children | bf17b1e4a19c |
| files | rhodecode/model/forms.py rhodecode/templates/admin/users/user_add.html rhodecode/templates/register.html rhodecode/tests/functional/test_login.py |
| diffstat | 4 files changed, 14 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/rhodecode/model/forms.py Thu Jul 12 16:54:46 2012 +0200 +++ b/rhodecode/model/forms.py Thu Jul 12 17:14:59 2012 +0200 @@ -151,7 +151,7 @@ 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))
--- a/rhodecode/templates/admin/users/user_add.html Thu Jul 12 16:54:46 2012 +0200 +++ b/rhodecode/templates/admin/users/user_add.html Thu Jul 12 17:14:59 2012 +0200 @@ -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>
--- a/rhodecode/templates/register.html Thu Jul 12 16:54:46 2012 +0200 +++ b/rhodecode/templates/register.html Thu Jul 12 17:14:59 2012 +0200 @@ -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>
--- a/rhodecode/tests/functional/test_login.py Thu Jul 12 16:54:46 2012 +0200 +++ b/rhodecode/tests/functional/test_login.py Thu Jul 12 17:14:59 2012 +0200 @@ -85,7 +85,7 @@ '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 @@ '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 @@ '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 @@ '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 @@ '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 @@ '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 @@ 'password': 'ąćźżąśśśś', 'password_confirmation': 'ąćźżąśśśś', 'email': 'goodmailm@test.plx', - 'name': 'test', + 'firstname': 'test', 'lastname': 'test'}) msg = validators.ValidPassword()._messages['invalid_password'] @@ -175,7 +175,7 @@ '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 @@ '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')