diff --git a/rhodecode/model/repos_group.py b/rhodecode/model/repos_group.py --- a/rhodecode/model/repos_group.py +++ b/rhodecode/model/repos_group.py @@ -39,9 +39,6 @@ log = logging.getLogger(__name__) class ReposGroupModel(BaseModel): - def __get_user(self, user): - return self._get_instance(User, user, callback=User.get_by_username) - def __get_users_group(self, users_group): return self._get_instance(UsersGroup, users_group, callback=UsersGroup.get_by_group_name) @@ -50,10 +47,6 @@ class ReposGroupModel(BaseModel): return self._get_instance(RepoGroup, repos_group, callback=RepoGroup.get_by_group_name) - def __get_perm(self, permission): - return self._get_instance(Permission, permission, - callback=Permission.get_by_key) - @LazyProperty def repos_path(self): """ @@ -206,13 +199,13 @@ class ReposGroupModel(BaseModel): log.error(traceback.format_exc()) raise - def delete(self, users_group_id): + def delete(self, repos_group): + repos_group = self.__get_repos_group(repos_group) try: - users_group = RepoGroup.get(users_group_id) - self.sa.delete(users_group) - self.__delete_group(users_group) + self.sa.delete(repos_group) + self.__delete_group(repos_group) except: - log.error(traceback.format_exc()) + log.exception('Error removing repos_group %s' % repos_group) raise def grant_user_permission(self, repos_group, user, perm): @@ -227,8 +220,8 @@ class ReposGroupModel(BaseModel): """ repos_group = self.__get_repos_group(repos_group) - user = self.__get_user(user) - permission = self.__get_perm(perm) + user = self._get_user(user) + permission = self._get_perm(perm) # check if we have that permission already obj = self.sa.query(UserRepoGroupToPerm)\ @@ -253,7 +246,7 @@ class ReposGroupModel(BaseModel): """ repos_group = self.__get_repos_group(repos_group) - user = self.__get_user(user) + user = self._get_user(user) obj = self.sa.query(UserRepoGroupToPerm)\ .filter(UserRepoGroupToPerm.user == user)\ @@ -274,7 +267,7 @@ class ReposGroupModel(BaseModel): """ repos_group = self.__get_repos_group(repos_group) group_name = self.__get_users_group(group_name) - permission = self.__get_perm(perm) + permission = self._get_perm(perm) # check if we have that permission already obj = self.sa.query(UsersGroupRepoGroupToPerm)\