Mercurial > kallithea
diff rhodecode/model/user.py @ 2432:d3ac7491a5c8 codereview
Share common getter functions in base model, and remove duplicated functions from other models
author | Marcin Kuzminski <marcin@python-works.com> |
---|---|
date | Sat, 09 Jun 2012 20:23:48 +0200 |
parents | b0fef8a77568 |
children | 4419551b2915 |
line wrap: on
line diff
--- a/rhodecode/model/user.py Sat Jun 09 18:10:59 2012 +0200 +++ b/rhodecode/model/user.py Sat Jun 09 20:23:48 2012 +0200 @@ -35,8 +35,8 @@ from rhodecode.model import BaseModel from rhodecode.model.db import User, UserRepoToPerm, Repository, Permission, \ UserToPerm, UsersGroupRepoToPerm, UsersGroupToPerm, UsersGroupMember, \ - Notification, RepoGroup, UserRepoGroupToPerm, UsersGroup,\ - UsersGroupRepoGroupToPerm, UserEmailMap + Notification, RepoGroup, UserRepoGroupToPerm, UsersGroupRepoGroupToPerm, \ + UserEmailMap from rhodecode.lib.exceptions import DefaultUserException, \ UserOwnsReposException @@ -61,13 +61,6 @@ class UserModel(BaseModel): - def __get_user(self, user): - return self._get_instance(User, user, callback=User.get_by_username) - - def __get_perm(self, permission): - return self._get_instance(Permission, permission, - callback=Permission.get_by_key) - def get(self, user_id, cache=False): user = self.sa.query(User) if cache: @@ -76,7 +69,7 @@ return user.get(user_id) def get_user(self, user): - return self.__get_user(user) + return self._get_user(user) def get_by_username(self, username, cache=False, case_insensitive=False): @@ -292,7 +285,7 @@ raise def delete(self, user): - user = self.__get_user(user) + user = self._get_user(user) try: if user.username == 'default': @@ -545,7 +538,7 @@ raise Exception('perm needs to be an instance of Permission class ' 'got %s instead' % type(perm)) - user = self.__get_user(user) + user = self._get_user(user) return UserToPerm.query().filter(UserToPerm.user == user)\ .filter(UserToPerm.permission == perm).scalar() is not None @@ -557,8 +550,8 @@ :param user: :param perm: """ - user = self.__get_user(user) - perm = self.__get_perm(perm) + user = self._get_user(user) + perm = self._get_perm(perm) # if this permission is already granted skip it _perm = UserToPerm.query()\ .filter(UserToPerm.user == user)\ @@ -578,8 +571,8 @@ :param user: :param perm: """ - user = self.__get_user(user) - perm = self.__get_perm(perm) + user = self._get_user(user) + perm = self._get_perm(perm) obj = UserToPerm.query()\ .filter(UserToPerm.user == user)\ @@ -595,7 +588,7 @@ :param user: :param email: """ - user = self.__get_user(user) + user = self._get_user(user) obj = UserEmailMap() obj.user = user obj.email = email @@ -609,7 +602,7 @@ :param user: :param email_id: """ - user = self.__get_user(user) + user = self._get_user(user) obj = UserEmailMap.query().get(email_id) if obj: self.sa.delete(obj) \ No newline at end of file