haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-19 10:26:17 +00:00
Code Issues Releases Wiki Activity

WIP: update return fields

Browse Source
This commit is contained in:
zhengxie
2015-07-01 15:21:08 +08:00
parent 0a13dd88bb
commit 7d6b84ecc5
2 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
seahub/api2/views.py
View File

@@ -2270,7 +2270,7 @@ class DirSharedItemsView(APIView):
"name": item.user, "name": item.user,
"nickname": email2nickname(item.user), "nickname": email2nickname(item.user),
}, },
"perm": item.perm, "permission": item.perm,
}) })
return ret return ret
@@ -2402,7 +2402,14 @@ class DirSharedItemsView(APIView):
from_user=username, from_user=username,
to_user=to_user, to_user=to_user,
repo=shared_repo) repo=shared_repo)
success.append(to_user) success.append({
"share_type": "user",
"user_info": {
"name": to_user,
"nickname": email2nickname(to_user),
},
"permission": permission
})
except SearpcError as e: except SearpcError as e:
logger.error(e) logger.error(e)
failed.append(to_user) failed.append(to_user)
@@ -2412,8 +2419,8 @@ class DirSharedItemsView(APIView):
pass pass
return HttpResponse(json.dumps({ return HttpResponse(json.dumps({
"shared_success": success, "success": success,
"shared_failed": failed "failed": failed
}), status=200, content_type=json_content_type) }), status=200, content_type=json_content_type)
def delete(self, request, repo_id, format=None): def delete(self, request, repo_id, format=None):
@@ -2455,7 +2462,7 @@ class DirSharedItemsView(APIView):
if shared_to_group: if shared_to_group:
pass pass
return HttpResponse(json.dumps([{'success': True}]), status=200, return HttpResponse(json.dumps({'success': True}), status=200,
content_type=json_content_type) content_type=json_content_type)

6
tests/api/test_shares.py
View File

@@ -92,8 +92,8 @@ class DirSharedItemsTest(TestCase, Fixtures):
) )
self.assertEqual(200, resp.status_code) self.assertEqual(200, resp.status_code)
json_resp = json.loads(resp.content) json_resp = json.loads(resp.content)
assert 'a@a.com' in json_resp['shared_success'] assert len(json_resp['success']) == 2
assert 'b@b.com' in json_resp['shared_success'] assert json_resp['success'][0]['permission'] == 'r'
def test_can_update(self): def test_can_update(self):
self._login_as(self.user) self._login_as(self.user)
@@ -116,7 +116,7 @@ class DirSharedItemsTest(TestCase, Fixtures):
)) ))
self.assertEqual(200, resp.status_code) self.assertEqual(200, resp.status_code)
json_resp = json.loads(resp.content) json_resp = json.loads(resp.content)
assert json_resp[0]['success'] is True assert json_resp['success'] is True
resp = self.client.get('/api2/repos/%s/dir/shared_items/?p=%s&share_type=user,group' % ( resp = self.client.get('/api2/repos/%s/dir/shared_items/?p=%s&share_type=user,group' % (
self.repo.id, self.repo.id,