Mercurial > kallithea
comparison rhodecode/model/user.py @ 2330:b0fef8a77568 codereview
Added simple UI for admin to manage emails map
author | Marcin Kuzminski <marcin@python-works.com> |
---|---|
date | Wed, 23 May 2012 00:58:37 +0200 |
parents | 24095abde696 |
children | d3ac7491a5c8 |
comparison
equal
deleted
inserted
replaced
2329:20e307d5250f | 2330:b0fef8a77568 |
---|---|
34 | 34 |
35 from rhodecode.model import BaseModel | 35 from rhodecode.model import BaseModel |
36 from rhodecode.model.db import User, UserRepoToPerm, Repository, Permission, \ | 36 from rhodecode.model.db import User, UserRepoToPerm, Repository, Permission, \ |
37 UserToPerm, UsersGroupRepoToPerm, UsersGroupToPerm, UsersGroupMember, \ | 37 UserToPerm, UsersGroupRepoToPerm, UsersGroupToPerm, UsersGroupMember, \ |
38 Notification, RepoGroup, UserRepoGroupToPerm, UsersGroup,\ | 38 Notification, RepoGroup, UserRepoGroupToPerm, UsersGroup,\ |
39 UsersGroupRepoGroupToPerm | 39 UsersGroupRepoGroupToPerm, UserEmailMap |
40 from rhodecode.lib.exceptions import DefaultUserException, \ | 40 from rhodecode.lib.exceptions import DefaultUserException, \ |
41 UserOwnsReposException | 41 UserOwnsReposException |
42 | 42 |
43 from sqlalchemy.exc import DatabaseError | 43 from sqlalchemy.exc import DatabaseError |
44 | 44 |
585 .filter(UserToPerm.user == user)\ | 585 .filter(UserToPerm.user == user)\ |
586 .filter(UserToPerm.permission == perm)\ | 586 .filter(UserToPerm.permission == perm)\ |
587 .scalar() | 587 .scalar() |
588 if obj: | 588 if obj: |
589 self.sa.delete(obj) | 589 self.sa.delete(obj) |
590 | |
591 def add_extra_email(self, user, email): | |
592 """ | |
593 Adds email address to UserEmailMap | |
594 | |
595 :param user: | |
596 :param email: | |
597 """ | |
598 user = self.__get_user(user) | |
599 obj = UserEmailMap() | |
600 obj.user = user | |
601 obj.email = email | |
602 self.sa.add(obj) | |
603 return obj | |
604 | |
605 def delete_extra_email(self, user, email_id): | |
606 """ | |
607 Removes email address from UserEmailMap | |
608 | |
609 :param user: | |
610 :param email_id: | |
611 """ | |
612 user = self.__get_user(user) | |
613 obj = UserEmailMap.query().get(email_id) | |
614 if obj: | |
615 self.sa.delete(obj) |