Mercurial > kallithea
diff rhodecode/model/repo.py @ 1713:54687aa00724 beta
Tests updates, Session refactoring
author | Marcin Kuzminski <marcin@python-works.com> |
---|---|
date | Wed, 23 Nov 2011 15:36:57 +0200 |
parents | f522f4d3bf93 |
children | 7d1fc253549e |
line wrap: on
line diff
--- a/rhodecode/model/repo.py Wed Nov 23 00:55:05 2011 +0200 +++ b/rhodecode/model/repo.py Wed Nov 23 15:36:57 2011 +0200 @@ -300,10 +300,11 @@ def delete_perm_user(self, form_data, repo_name): try: - self.sa.query(UserRepoToPerm)\ + obj = self.sa.query(UserRepoToPerm)\ .filter(UserRepoToPerm.repository \ == self.get_by_repo_name(repo_name))\ - .filter(UserRepoToPerm.user_id == form_data['user_id']).delete() + .filter(UserRepoToPerm.user_id == form_data['user_id']).one() + self.sa.delete(obj) self.sa.commit() except: log.error(traceback.format_exc()) @@ -312,11 +313,12 @@ def delete_perm_users_group(self, form_data, repo_name): try: - self.sa.query(UsersGroupRepoToPerm)\ + obj = self.sa.query(UsersGroupRepoToPerm)\ .filter(UsersGroupRepoToPerm.repository \ == self.get_by_repo_name(repo_name))\ .filter(UsersGroupRepoToPerm.users_group_id \ - == form_data['users_group_id']).delete() + == form_data['users_group_id']).one() + self.sa.delete(obj) self.sa.commit() except: log.error(traceback.format_exc()) @@ -325,9 +327,10 @@ def delete_stats(self, repo_name): try: - self.sa.query(Statistics)\ - .filter(Statistics.repository == \ - self.get_by_repo_name(repo_name)).delete() + obj = self.sa.query(Statistics)\ + .filter(Statistics.repository == \ + self.get_by_repo_name(repo_name)).one() + self.sa.delete(obj) self.sa.commit() except: log.error(traceback.format_exc())