Mercurial > kallithea
changeset 5947:6754597990cb stable
api: fix forking of repos in repo groups (Issue #210)
Patch by Alexandre Beaulieu.
author | Mads Kiilerich <madski@unity3d.com> |
---|---|
date | Mon, 30 May 2016 15:33:19 +0200 |
parents | ffe4d5060d91 |
children | 7d0052c68a6f 110dcae69d7d |
files | kallithea/controllers/api/api.py kallithea/tests/api/api_base.py |
diffstat | 2 files changed, 7 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/kallithea/controllers/api/api.py Mon May 30 15:32:22 2016 +0200 +++ b/kallithea/controllers/api/api.py Mon May 30 15:33:19 2016 +0200 @@ -1675,9 +1675,10 @@ try: # create structure of groups and return the last group group = map_groups(fork_name) + fork_base_name = fork_name.rsplit('/', 1)[-1] form_data = dict( - repo_name=fork_name, + repo_name=fork_base_name, repo_name_full=fork_name, repo_group=group, repo_type=repo.repo_type,
--- a/kallithea/tests/api/api_base.py Mon May 30 15:32:22 2016 +0200 +++ b/kallithea/tests/api/api_base.py Mon May 30 15:33:19 2016 +0200 @@ -1391,8 +1391,11 @@ self._compare_ok(id_, expected, given=response.body) fixture.destroy_repo(fork_name) - def test_api_fork_repo_non_admin(self): - fork_name = 'api-repo-fork' + @parameterized.expand([ + (u'api-repo-fork',), + (u'%s/api-repo-fork' % TEST_REPO_GROUP,), + ]) + def test_api_fork_repo_non_admin(self, fork_name): id_, params = _build_data(self.apikey_regular, 'fork_repo', repoid=self.REPO, fork_name=fork_name,