Mercurial > kallithea
comparison rhodecode/model/repo.py @ 3415:b8f929bff7e3 beta
fixed tests and missing replacements from 5f1850e4712a
| author | Marcin Kuzminski <marcin@python-works.com> |
|---|---|
| date | Wed, 27 Feb 2013 02:27:09 +0100 |
| parents | 059efaea23d6 |
| children | fa6ba6727475 |
comparison
equal
deleted
inserted
replaced
| 3414:25c670081761 | 3415:b8f929bff7e3 |
|---|---|
| 547 self.sa.delete(obj) | 547 self.sa.delete(obj) |
| 548 log.debug('Revoked perm on %s on %s' % (repo, user)) | 548 log.debug('Revoked perm on %s on %s' % (repo, user)) |
| 549 | 549 |
| 550 def grant_users_group_permission(self, repo, group_name, perm): | 550 def grant_users_group_permission(self, repo, group_name, perm): |
| 551 """ | 551 """ |
| 552 Grant permission for users group on given repository, or update | 552 Grant permission for user group on given repository, or update |
| 553 existing one if found | 553 existing one if found |
| 554 | 554 |
| 555 :param repo: Instance of Repository, repository_id, or repository name | 555 :param repo: Instance of Repository, repository_id, or repository name |
| 556 :param group_name: Instance of UserGroup, users_group_id, | 556 :param group_name: Instance of UserGroup, users_group_id, |
| 557 or users group name | 557 or user group name |
| 558 :param perm: Instance of Permission, or permission_name | 558 :param perm: Instance of Permission, or permission_name |
| 559 """ | 559 """ |
| 560 repo = self._get_repo(repo) | 560 repo = self._get_repo(repo) |
| 561 group_name = self.__get_users_group(group_name) | 561 group_name = self.__get_users_group(group_name) |
| 562 permission = self._get_perm(perm) | 562 permission = self._get_perm(perm) |
| 577 self.sa.add(obj) | 577 self.sa.add(obj) |
| 578 log.debug('Granted perm %s to %s on %s' % (perm, group_name, repo)) | 578 log.debug('Granted perm %s to %s on %s' % (perm, group_name, repo)) |
| 579 | 579 |
| 580 def revoke_users_group_permission(self, repo, group_name): | 580 def revoke_users_group_permission(self, repo, group_name): |
| 581 """ | 581 """ |
| 582 Revoke permission for users group on given repository | 582 Revoke permission for user group on given repository |
| 583 | 583 |
| 584 :param repo: Instance of Repository, repository_id, or repository name | 584 :param repo: Instance of Repository, repository_id, or repository name |
| 585 :param group_name: Instance of UserGroup, users_group_id, | 585 :param group_name: Instance of UserGroup, users_group_id, |
| 586 or users group name | 586 or user group name |
| 587 """ | 587 """ |
| 588 repo = self._get_repo(repo) | 588 repo = self._get_repo(repo) |
| 589 group_name = self.__get_users_group(group_name) | 589 group_name = self.__get_users_group(group_name) |
| 590 | 590 |
| 591 obj = self.sa.query(UsersGroupRepoToPerm)\ | 591 obj = self.sa.query(UsersGroupRepoToPerm)\ |