Mercurial > kallithea
changeset 4769:2181d0058c6a
usergroup: more descriptive error message when deleting user group
| author | Joseph Rivera <rivera.d.joseph@gmail.com> |
|---|---|
| date | Wed, 21 Jan 2015 09:52:28 -0500 |
| parents | ea2cc8a85280 |
| children | 47d2659ed5c0 |
| files | kallithea/model/user_group.py kallithea/tests/api/api_base.py |
| diffstat | 2 files changed, 4 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/kallithea/model/user_group.py Wed Jan 14 18:03:00 2015 +0100 +++ b/kallithea/model/user_group.py Wed Jan 21 09:52:28 2015 -0500 @@ -152,7 +152,7 @@ def delete(self, user_group, force=False): """ - Deletes repository group, unless force flag is used + Deletes user group, unless force flag is used raises exception if there are members in that group, else deletes group and users @@ -164,10 +164,11 @@ # check if this group is not assigned to repo assigned_groups = UserGroupRepoToPerm.query()\ .filter(UserGroupRepoToPerm.users_group == user_group).all() + assigned_groups = [x.repository.repo_name for x in assigned_groups] if assigned_groups and not force: raise UserGroupsAssignedException( - 'RepoGroup assigned to %s' % assigned_groups) + 'User Group assigned to %s' % ", ".join(assigned_groups)) self.sa.delete(user_group) except Exception: log.error(traceback.format_exc())
--- a/kallithea/tests/api/api_base.py Wed Jan 14 18:03:00 2015 +0100 +++ b/kallithea/tests/api/api_base.py Wed Jan 21 09:52:28 2015 -0500 @@ -1568,7 +1568,7 @@ gr_id = ugroup.users_group_id ugr_to_perm = RepoModel().grant_user_group_permission(self.REPO, gr_name, 'repository.write') - msg = 'RepoGroup assigned to [%s]' % (ugr_to_perm) + msg = 'User Group assigned to %s' % ugr_to_perm.repository.repo_name id_, params = _build_data(self.apikey, 'delete_user_group', usergroupid=gr_name,