diff options
author | Marcin Kuzminski <marcin@python-works.com> | 2012-06-18 21:25:49 +0200 |
---|---|---|
committer | Marcin Kuzminski <marcin@python-works.com> | 2012-06-18 21:25:49 +0200 |
commit | 02d6cc4503aa3f46d2b07186a5266e9407715676 (patch) | |
tree | 65c8747c91a5946308772db57d76ecebef6b27f4 /rhodecode/model/user.py | |
parent | 2d988da18391803efa112ab793ee3820af84516e (diff) |
Added validation into user email map
--HG--
branch : beta
Diffstat (limited to 'rhodecode/model/user.py')
-rw-r--r-- | rhodecode/model/user.py | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/rhodecode/model/user.py b/rhodecode/model/user.py index 855c5f18..7b282f2b 100644 --- a/rhodecode/model/user.py +++ b/rhodecode/model/user.py @@ -29,9 +29,11 @@ import traceback from pylons import url from pylons.i18n.translation import _ +from sqlalchemy.exc import DatabaseError +from sqlalchemy.orm import joinedload + from rhodecode.lib.utils2 import safe_unicode, generate_api_key from rhodecode.lib.caching_query import FromCache - from rhodecode.model import BaseModel from rhodecode.model.db import User, UserRepoToPerm, Repository, Permission, \ UserToPerm, UsersGroupRepoToPerm, UsersGroupToPerm, UsersGroupMember, \ @@ -40,9 +42,6 @@ from rhodecode.model.db import User, UserRepoToPerm, Repository, Permission, \ from rhodecode.lib.exceptions import DefaultUserException, \ UserOwnsReposException -from sqlalchemy.exc import DatabaseError - -from sqlalchemy.orm import joinedload log = logging.getLogger(__name__) @@ -593,10 +592,14 @@ class UserModel(BaseModel): :param user: :param email: """ + from rhodecode.model import forms + form = forms.UserExtraEmailForm()() + data = form.to_python(dict(email=email)) user = self._get_user(user) + obj = UserEmailMap() obj.user = user - obj.email = email + obj.email = data['email'] self.sa.add(obj) return obj |