kallithea Changeset - 2181d0058c6a

Changeset - 2181d0058c6a

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

Joseph Rivera - 11 years ago 2015-01-21 15:52:28
rivera.d.joseph@gmail.com

usergroup: more descriptive error message when deleting user group

2 files changed with 4 insertions and 3 deletions:

kallithea/model/user_group.py

kallithea/tests/api/api_base.py

0 comments (0 inline, 0 general)

kallithea/model/user_group.py

➞

Show inline comments

@@ @@ -149,28 +149,29 @@ class UserGroupModel(BaseModel): @@
         except Exception:
             log.error(traceback.format_exc())
             raise
     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
         :param user_group:
         :param force:
         """
         user_group = self._get_user_group(user_group)
         try:
             # 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())
             raise
     def add_user_to_group(self, user_group, user):

kallithea/tests/api/api_base.py

➞

Show inline comments

@@ @@ -1565,13 +1565,13 @@ class BaseTestApi(object): @@
     def test_api_delete_user_group_that_is_assigned(self):
         gr_name = 'test_group'
         ugroup = fixture.create_user_group(gr_name)
         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,
                                   userid=TEST_USER_ADMIN_LOGIN)
         response = api_call(self, params)

0 comments (0 inline, 0 general)