##// END OF EJS Templates
renamed some leftover name -> firstname
marcink -
r2595:6c83dc02 beta
parent child Browse files
Show More
@@ -151,7 +151,7 def RegisterForm(edit=False, old_data={}
151 151 v.UnicodeString(strip=False, min=6, not_empty=True)
152 152 )
153 153 active = v.StringBoolean(if_missing=False)
154 name = v.UnicodeString(strip=True, min=1, not_empty=False)
154 firstname = v.UnicodeString(strip=True, min=1, not_empty=False)
155 155 lastname = v.UnicodeString(strip=True, min=1, not_empty=False)
156 156 email = All(v.Email(not_empty=True), v.UniqSystemEmail(old_data))
157 157
@@ -56,10 +56,10
56 56
57 57 <div class="field">
58 58 <div class="label">
59 <label for="name">${_('First Name')}:</label>
59 <label for="firstname">${_('First Name')}:</label>
60 60 </div>
61 61 <div class="input">
62 ${h.text('name',class_='small')}
62 ${h.text('firstname',class_='small')}
63 63 </div>
64 64 </div>
65 65
@@ -44,10 +44,10
44 44
45 45 <div class="field">
46 46 <div class="label">
47 <label for="name">${_('First Name')}:</label>
47 <label for="firstname">${_('First Name')}:</label>
48 48 </div>
49 49 <div class="input">
50 ${h.text('name',class_="medium")}
50 ${h.text('firstname',class_="medium")}
51 51 </div>
52 52 </div>
53 53
@@ -85,7 +85,7 class TestLoginController(TestController
85 85 'password': 'test12',
86 86 'password_confirmation': 'test12',
87 87 'email': 'goodmail@domain.com',
88 'name': 'test',
88 'firstname': 'test',
89 89 'lastname': 'test'})
90 90
91 91 msg = validators.ValidUsername()._messages['username_exists']
@@ -98,7 +98,7 class TestLoginController(TestController
98 98 'password': 'test12',
99 99 'password_confirmation': 'test12',
100 100 'email': 'test_admin@mail.com',
101 'name': 'test',
101 'firstname': 'test',
102 102 'lastname': 'test'})
103 103
104 104 msg = validators.UniqSystemEmail()()._messages['email_taken']
@@ -110,7 +110,7 class TestLoginController(TestController
110 110 'password': 'test12',
111 111 'password_confirmation': 'test12',
112 112 'email': 'TesT_Admin@mail.COM',
113 'name': 'test',
113 'firstname': 'test',
114 114 'lastname': 'test'})
115 115 msg = validators.UniqSystemEmail()()._messages['email_taken']
116 116 response.mustcontain(msg)
@@ -121,7 +121,7 class TestLoginController(TestController
121 121 'password': 'test',
122 122 'password_confirmation': 'test',
123 123 'email': 'goodmailm',
124 'name': 'test',
124 'firstname': 'test',
125 125 'lastname': 'test'})
126 126 self.assertEqual(response.status, '200 OK')
127 127 response.mustcontain('An email address must contain a single @')
@@ -133,7 +133,7 class TestLoginController(TestController
133 133 'password': 'test12',
134 134 'password_confirmation': 'test12',
135 135 'email': 'goodmailm',
136 'name': 'test',
136 'firstname': 'test',
137 137 'lastname': 'test'})
138 138
139 139 response.mustcontain('An email address must contain a single @')
@@ -149,7 +149,7 class TestLoginController(TestController
149 149 'password': 'test12',
150 150 'password_confirmation': 'test12',
151 151 'email': 'goodmailm',
152 'name': 'test',
152 'firstname': 'test',
153 153 'lastname': 'test'})
154 154
155 155 response.mustcontain('An email address must contain a single @')
@@ -163,7 +163,7 class TestLoginController(TestController
163 163 'password': 'ąćźżąśśśś',
164 164 'password_confirmation': 'ąćźżąśśśś',
165 165 'email': 'goodmailm@test.plx',
166 'name': 'test',
166 'firstname': 'test',
167 167 'lastname': 'test'})
168 168
169 169 msg = validators.ValidPassword()._messages['invalid_password']
@@ -175,7 +175,7 class TestLoginController(TestController
175 175 'password': '123qwe',
176 176 'password_confirmation': 'qwe123',
177 177 'email': 'goodmailm@test.plxa',
178 'name': 'test',
178 'firstname': 'test',
179 179 'lastname': 'test'})
180 180 msg = validators.ValidPasswordsMatch()._messages['password_mismatch']
181 181 response.mustcontain(msg)
@@ -192,7 +192,7 class TestLoginController(TestController
192 192 'password': password,
193 193 'password_confirmation': password,
194 194 'email': email,
195 'name': name,
195 'firstname': name,
196 196 'lastname': lastname,
197 197 'admin': True}) # This should be overriden
198 198 self.assertEqual(response.status, '302 Found')
General Comments 0
You need to be logged in to leave comments. Login now