##// END OF EJS Templates
fixes #36, removed username, name, lastname, minimal length restrictions,...
marcink -
r527:6d44d386 default
parent child Browse files
Show More
@@ -247,7 +247,7 b' class LoginForm(formencode.Schema):'
247 filter_extra_fields = True
247 filter_extra_fields = True
248 username = UnicodeString(
248 username = UnicodeString(
249 strip=True,
249 strip=True,
250 min=3,
250 min=1,
251 not_empty=True,
251 not_empty=True,
252 messages={
252 messages={
253 'empty':_('Please enter a login'),
253 'empty':_('Please enter a login'),
@@ -256,7 +256,7 b' class LoginForm(formencode.Schema):'
256
256
257 password = UnicodeString(
257 password = UnicodeString(
258 strip=True,
258 strip=True,
259 min=3,
259 min=8,
260 not_empty=True,
260 not_empty=True,
261 messages={
261 messages={
262 'empty':_('Please enter a password'),
262 'empty':_('Please enter a password'),
@@ -271,15 +271,15 b' def UserForm(edit=False, old_data={}):'
271 class _UserForm(formencode.Schema):
271 class _UserForm(formencode.Schema):
272 allow_extra_fields = True
272 allow_extra_fields = True
273 filter_extra_fields = True
273 filter_extra_fields = True
274 username = All(UnicodeString(strip=True, min=3, not_empty=True), ValidUsername(edit, old_data))
274 username = All(UnicodeString(strip=True, min=1, not_empty=True), ValidUsername(edit, old_data))
275 if edit:
275 if edit:
276 new_password = All(UnicodeString(strip=True, min=3, not_empty=False), ValidPassword)
276 new_password = All(UnicodeString(strip=True, min=8, not_empty=False), ValidPassword)
277 admin = StringBoolean(if_missing=False)
277 admin = StringBoolean(if_missing=False)
278 else:
278 else:
279 password = All(UnicodeString(strip=True, min=8, not_empty=True), ValidPassword)
279 password = All(UnicodeString(strip=True, min=8, not_empty=True), ValidPassword)
280 active = StringBoolean(if_missing=False)
280 active = StringBoolean(if_missing=False)
281 name = UnicodeString(strip=True, min=3, not_empty=True)
281 name = UnicodeString(strip=True, min=1, not_empty=True)
282 lastname = UnicodeString(strip=True, min=3, not_empty=True)
282 lastname = UnicodeString(strip=True, min=1, not_empty=True)
283 email = All(Email(not_empty=True), UniqSystemEmail(old_data))
283 email = All(Email(not_empty=True), UniqSystemEmail(old_data))
284
284
285 return _UserForm
285 return _UserForm
@@ -298,7 +298,7 b' def RepoForm(edit=False, old_data={}):'
298 allow_extra_fields = True
298 allow_extra_fields = True
299 filter_extra_fields = False
299 filter_extra_fields = False
300 repo_name = All(UnicodeString(strip=True, min=1, not_empty=True), ValidRepoName(edit, old_data))
300 repo_name = All(UnicodeString(strip=True, min=1, not_empty=True), ValidRepoName(edit, old_data))
301 description = UnicodeString(strip=True, min=3, not_empty=True)
301 description = UnicodeString(strip=True, min=1, not_empty=True)
302 private = StringBoolean(if_missing=False)
302 private = StringBoolean(if_missing=False)
303
303
304 if edit:
304 if edit:
@@ -312,7 +312,7 b' def RepoSettingsForm(edit=False, old_dat'
312 allow_extra_fields = True
312 allow_extra_fields = True
313 filter_extra_fields = False
313 filter_extra_fields = False
314 repo_name = All(UnicodeString(strip=True, min=1, not_empty=True), ValidRepoName(edit, old_data))
314 repo_name = All(UnicodeString(strip=True, min=1, not_empty=True), ValidRepoName(edit, old_data))
315 description = UnicodeString(strip=True, min=3, not_empty=True)
315 description = UnicodeString(strip=True, min=1, not_empty=True)
316 private = StringBoolean(if_missing=False)
316 private = StringBoolean(if_missing=False)
317
317
318 chained_validators = [ValidPerms, ValidSettings]
318 chained_validators = [ValidPerms, ValidSettings]
@@ -323,8 +323,8 b' def ApplicationSettingsForm():'
323 class _ApplicationSettingsForm(formencode.Schema):
323 class _ApplicationSettingsForm(formencode.Schema):
324 allow_extra_fields = True
324 allow_extra_fields = True
325 filter_extra_fields = False
325 filter_extra_fields = False
326 hg_app_title = UnicodeString(strip=True, min=3, not_empty=True)
326 hg_app_title = UnicodeString(strip=True, min=1, not_empty=True)
327 hg_app_realm = UnicodeString(strip=True, min=3, not_empty=True)
327 hg_app_realm = UnicodeString(strip=True, min=1, not_empty=True)
328
328
329 return _ApplicationSettingsForm
329 return _ApplicationSettingsForm
330
330
@@ -333,7 +333,7 b' def ApplicationUiSettingsForm():'
333 allow_extra_fields = True
333 allow_extra_fields = True
334 filter_extra_fields = False
334 filter_extra_fields = False
335 web_push_ssl = OneOf(['true', 'false'], if_missing='false')
335 web_push_ssl = OneOf(['true', 'false'], if_missing='false')
336 paths_root_path = All(ValidPath(), UnicodeString(strip=True, min=3, not_empty=True))
336 paths_root_path = All(ValidPath(), UnicodeString(strip=True, min=1, not_empty=True))
337 hooks_changegroup_update = OneOf(['True', 'False'], if_missing=False)
337 hooks_changegroup_update = OneOf(['True', 'False'], if_missing=False)
338 hooks_changegroup_repo_size = OneOf(['True', 'False'], if_missing=False)
338 hooks_changegroup_repo_size = OneOf(['True', 'False'], if_missing=False)
339
339
@@ -3152,7 +3152,7 b' h3.files_location{'
3152 border-bottom: 1px solid #CCCCCC;
3152 border-bottom: 1px solid #CCCCCC;
3153 border-left: 1px solid #CCCCCC;
3153 border-left: 1px solid #CCCCCC;
3154 border-right: 1px solid #CCCCCC;
3154 border-right: 1px solid #CCCCCC;
3155 min-height: 90px;
3155 min-height: 80px;
3156 overflow: hidden;
3156 overflow: hidden;
3157 font-size:1.2em;
3157 font-size:1.2em;
3158 }
3158 }
@@ -3223,14 +3223,14 b' h3.files_location{'
3223 }
3223 }
3224
3224
3225 .right .logtags .branchtag{
3225 .right .logtags .branchtag{
3226 background: #FFFFFF url("../images/icons/arrow_branch.png") no-repeat 130px 9px;
3226 background: #FFFFFF url("../images/icons/arrow_branch.png") no-repeat right 9px;
3227 display:block;
3227 display:block;
3228 padding:12px 2px 2px 24px;
3228 padding:12px 16px 0px 0px
3229 }
3229 }
3230 .right .logtags .tagtag{
3230 .right .logtags .tagtag{
3231 background: #FFFFFF url("../images/icons/tag_blue.png") no-repeat 130px 9px;
3231 background: #FFFFFF url("../images/icons/tag_blue.png") no-repeat right 9px;
3232 display:block;
3232 display:block;
3233 padding:12px 2px 2px 24px;
3233 padding:12px 18px 0px 0px
3234 }
3234 }
3235
3235
3236 /* -----------------------------------------------------------
3236 /* -----------------------------------------------------------
@@ -76,9 +76,11 b''
76 </div>
76 </div>
77 %endfor
77 %endfor
78 <span class="logtags">
78 <span class="logtags">
79 <span class="branchtag">${cs.branch}</span>
79 <span class="branchtag" title="${'%s %s' % (_('branch'),cs.branch)}">
80 ${h.link_to(cs.branch,h.url('files_home',repo_name=c.repo_name,revision=cs.short_id))}</span>
80 %for tag in cs.tags:
81 %for tag in cs.tags:
81 <span class="tagtag">${tag}</span>
82 <span class="tagtag" title="${'%s %s' % (_('tag'),tag)}">
83 ${h.link_to(tag,h.url('files_home',repo_name=c.repo_name,revision=cs.short_id))}</span>
82 %endfor
84 %endfor
83 </span>
85 </span>
84 </div>
86 </div>
General Comments 0
You need to be logged in to leave comments. Login now