haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-07-31 14:52:38 +00:00
Code Issues Releases Wiki Activity

[api-v2.1] update transfer group api

Browse Source
This commit is contained in:
lian 2015-12-08 16:40:17 +08:00
parent 7da8a3e8b2
commit 46d9fea299
3 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
seahub/api2/endpoints/groups.py
View File

@ -236,6 +236,9 @@ class Groups(APIView):
logger.error(e) logger.error(e)
error_msg = _(u'Internal Server Error') error_msg = _(u'Internal Server Error')
return api_error(status.HTTP_500_INTERNAL_SERVER_ERROR, error_msg) return api_error(status.HTTP_500_INTERNAL_SERVER_ERROR, error_msg)
else:
error_msg = _('You can not transfer a group to yourself')
return api_error(status.HTTP_400_BAD_REQUEST, error_msg)
else: else:
error_msg = _(u'Operation can only be rename or transfer.') error_msg = _(u'Operation can only be rename or transfer.')
return api_error(status.HTTP_400_BAD_REQUEST, error_msg) return api_error(status.HTTP_400_BAD_REQUEST, error_msg)

8
tests/api/endpoints/test_groups.py
View File

@ -126,6 +126,14 @@ class GroupsTest(BaseTestCase):
json_resp = json.loads(resp.content) json_resp = json.loads(resp.content)
assert json_resp['creator'] == new_creator assert json_resp['creator'] == new_creator
def test_can_not_transfer_group_to_myself(self):
new_creator = self.user.email
url = reverse('api-v2.1-group', args=[self.group_id])
data = 'operation=transfer&email=%s' % new_creator
resp = self.client.put(url, data, 'application/x-www-form-urlencoded')
self.assertEqual(400, resp.status_code)
def test_can_delete_group(self): def test_can_delete_group(self):
url = reverse('api-v2.1-group', args=[self.group_id]) url = reverse('api-v2.1-group', args=[self.group_id])
resp = self.client.delete(url) resp = self.client.delete(url)

2
tests/seahub/views/test_sysadmin.py
View File

@ -198,6 +198,8 @@ class UserInfoTest(BaseTestCase):
self.admin_repo_id = r.id self.admin_repo_id = r.id
# set common user as staff in admin user's group # set common user as staff in admin user's group
ccnet_threaded_rpc.group_add_member(self.admin_group_1_id,
self.admin.email, self.user.email)
ccnet_threaded_rpc.group_set_admin(self.admin_group_1_id, self.user.email) ccnet_threaded_rpc.group_set_admin(self.admin_group_1_id, self.user.email)
# add common user to admin user's another group # add common user to admin user's another group