Mercurial > kallithea

comparison rhodecode/model/forms.py @ 2181:e1c1ebbe7346 beta

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
#419 don't strip passwords for login forms, make rhodecode more compatible with LDAP servers
author Marcin Kuzminski <marcin@python-works.com>
date Tue, 03 Apr 2012 00:02:25 +0200
parents 98f912832811
children 3ea397063fc7
comparison
equal deleted inserted replaced
2180:c2d3cb1fdbde 2181:e1c1ebbe7346
549 'empty': _('Please enter a login'), 549 'empty': _('Please enter a login'),
550 'tooShort': _('Enter a value %(min)i characters long or more')} 550 'tooShort': _('Enter a value %(min)i characters long or more')}
551 ) 551 )
552 552
553 password = UnicodeString( 553 password = UnicodeString(
554 strip=True, 554 strip=False,
555 min=3, 555 min=3,
556 not_empty=True, 556 not_empty=True,
557 messages={ 557 messages={
558 'empty': _('Please enter a password'), 558 'empty': _('Please enter a password'),
559 'tooShort': _('Enter %(min)i characters or more')} 559 'tooShort': _('Enter %(min)i characters or more')}
569 allow_extra_fields = True 569 allow_extra_fields = True
570 filter_extra_fields = True 570 filter_extra_fields = True
571 username = All(UnicodeString(strip=True, min=1, not_empty=True), 571 username = All(UnicodeString(strip=True, min=1, not_empty=True),
572 ValidUsername(edit, old_data)) 572 ValidUsername(edit, old_data))
573 if edit: 573 if edit:
574 new_password = All(UnicodeString(strip=True, min=6, not_empty=False)) 574 new_password = All(UnicodeString(strip=False, min=6, not_empty=False))
575 password_confirmation = All(UnicodeString(strip=True, min=6, 575 password_confirmation = All(UnicodeString(strip=False, min=6,
576 not_empty=False)) 576 not_empty=False))
577 admin = StringBoolean(if_missing=False) 577 admin = StringBoolean(if_missing=False)
578 else: 578 else:
579 password = All(UnicodeString(strip=True, min=6, not_empty=True)) 579 password = All(UnicodeString(strip=False, min=6, not_empty=True))
580 password_confirmation = All(UnicodeString(strip=True, min=6, 580 password_confirmation = All(UnicodeString(strip=False, min=6,
581 not_empty=False)) 581 not_empty=False))
582 582
583 active = StringBoolean(if_missing=False) 583 active = StringBoolean(if_missing=False)
584 name = UnicodeString(strip=True, min=1, not_empty=False) 584 name = UnicodeString(strip=True, min=1, not_empty=False)
585 lastname = UnicodeString(strip=True, min=1, not_empty=False) 585 lastname = UnicodeString(strip=True, min=1, not_empty=False)
630 class _RegisterForm(formencode.Schema): 630 class _RegisterForm(formencode.Schema):
631 allow_extra_fields = True 631 allow_extra_fields = True
632 filter_extra_fields = True 632 filter_extra_fields = True
633 username = All(ValidUsername(edit, old_data), 633 username = All(ValidUsername(edit, old_data),
634 UnicodeString(strip=True, min=1, not_empty=True)) 634 UnicodeString(strip=True, min=1, not_empty=True))
635 password = All(UnicodeString(strip=True, min=6, not_empty=True)) 635 password = All(UnicodeString(strip=False, min=6, not_empty=True))
636 password_confirmation = All(UnicodeString(strip=True, min=6, not_empty=True)) 636 password_confirmation = All(UnicodeString(strip=False, min=6, not_empty=True))
637 active = StringBoolean(if_missing=False) 637 active = StringBoolean(if_missing=False)
638 name = UnicodeString(strip=True, min=1, not_empty=False) 638 name = UnicodeString(strip=True, min=1, not_empty=False)
639 lastname = UnicodeString(strip=True, min=1, not_empty=False) 639 lastname = UnicodeString(strip=True, min=1, not_empty=False)
640 email = All(Email(not_empty=True), UniqSystemEmail(old_data)) 640 email = All(Email(not_empty=True), UniqSystemEmail(old_data))
641 641