kallithea: pylons_app/model/forms.py comparison

fixed bug when new repo had no last commiter, fixed bug when my_account updating information failed, by not uniq email address.

author	Marcin Kuzminski <marcin@python-works.com>
date	Mon, 20 Sep 2010 22:47:20 +0200
parents	9dd38344c466
children	74b9bed279ae

comparison

equal deleted inserted replaced

-:853b9425742a
+:460ad816820d
 msg = _('You need to specify * or ** at the end of path (ie. /tmp/*)')
 raise formencode.Invalid(msg, value, state,
 error_dict={'paths_root_path':msg})
-class UniqSystemEmail(formencode.validators.FancyValidator):
+def UniqSystemEmail(old_data):
-def to_python(self, value, state):
+class _UniqSystemEmail(formencode.validators.FancyValidator):
-sa = meta.Session
+def to_python(self, value, state):
-try:
+if old_data['email'] != value:
-user = sa.query(User).filter(User.email == value).scalar()
+sa = meta.Session
-if user:
+try:
-raise formencode.Invalid(_("That e-mail address is already taken") ,
+user = sa.query(User).filter(User.email == value).scalar()
-value, state)
+if user:
-finally:
+raise formencode.Invalid(_("That e-mail address is already taken") ,
-meta.Session.remove()
+value, state)
+finally:
-return value
+meta.Session.remove()
+return value
+return _UniqSystemEmail
 class ValidSystemEmail(formencode.validators.FancyValidator):
 def to_python(self, value, state):
 sa = meta.Session
 try:
 else:
 password = All(UnicodeString(strip=True, min=8, not_empty=True), ValidPassword)
 active = StringBoolean(if_missing=False)
 name = UnicodeString(strip=True, min=3, not_empty=True)
 lastname = UnicodeString(strip=True, min=3, not_empty=True)
-email = All(Email(not_empty=True), UniqSystemEmail())
+email = All(Email(not_empty=True), UniqSystemEmail(old_data))
 return _UserForm
 RegisterForm = UserForm

Mercurial > kallithea