kallithea Changeset - 74b9bed279ae

Changeset - 74b9bed279ae

Parent rev.

Child rev.

[Not reviewed]

celery

0 2 0

Marcin Kuzminski - 15 years ago 2010-09-20 22:55:55
marcin@python-works.com

fixed validation of user email in user creation, and editing on admin panel

2 files changed with 5 insertions and 3 deletions:

pylons_app/controllers/admin/users.py

pylons_app/model/forms.py

0 comments (0 inline, 0 general)

pylons_app/controllers/admin/users.py

➞

Show inline comments

@@ @@ -95,21 +95,23 @@ class UsersController(BaseController): @@
         #    <input type="hidden" name="_method" value="PUT" />
         # Or using helpers:
         #    h.form(url('user', id=ID),
         #           method='put')
         # url('user', id=ID)
         user_model = UserModel()
         _form = UserForm(edit=True, old_data={'user_id':id})()
         c.user = user_model.get_user(id)
         _form = UserForm(edit=True, old_data={'user_id':id,
                                               'email':c.user.email})()
         form_result = {}
         try:
             form_result = _form.to_python(dict(request.POST))
             user_model.update(id, form_result)
             h.flash(_('User updated succesfully'), category='success')
         except formencode.Invalid as errors:
             c.user = user_model.get_user(id)
             return htmlfill.render(
                 render('admin/users/user_edit.html'),
                 defaults=errors.value,
                 errors=errors.error_dict or {},
                 prefix_error=False,
                 encoding="UTF-8")

pylons_app/model/forms.py

➞

Show inline comments

@@ @@ -209,13 +209,13 @@ class ValidPath(formencode.validators.Fa @@
         raise formencode.Invalid(msg, value, state,
                                      error_dict={'paths_root_path':msg})
 def UniqSystemEmail(old_data):
     class _UniqSystemEmail(formencode.validators.FancyValidator):
         def to_python(self, value, state):
-            if old_data['email'] != value:
+            if old_data.get('email') != value:
                 sa = meta.Session
                 try:
                     user = sa.query(User).filter(User.email == value).scalar()
                     if user:
                         raise formencode.Invalid(_("That e-mail address is already taken") ,
                                                  value, state)

0 comments (0 inline, 0 general)