haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-13 13:50:07 +00:00
Code Issues Releases Wiki Activity

[api] Update wiki error msg

Browse Source
This commit is contained in:
zhengxie
2018-07-24 17:37:52 +08:00
committed by llj
parent cd4b108f87
commit 13a04f02d0
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
seahub/api2/endpoints/wikis.py
View File

@@ -100,13 +100,11 @@ class WikisView(APIView):
wiki = Wiki.objects.add(name, username, permission=permission, wiki = Wiki.objects.add(name, username, permission=permission,
org_id=org_id) org_id=org_id)
except DuplicateWikiNameError: except DuplicateWikiNameError:
result['error'] = _('%s is taken by others, please try another name.') % name msg = _('%s is taken by others, please try another name.') % name
return HttpResponse(json.dumps(result), status=400, return api_error(status.HTTP_400_BAD_REQUEST, msg)
content_type=content_type)
except IntegrityError: except IntegrityError:
result['error'] = 'Internal Server Error' msg = 'Internal Server Error'
return HttpResponse(json.dumps(result), status=500, return api_error(status.HTTP_500_INTERNAL_SERVER_ERROR, msg)
content_type=content_type)
# create home page # create home page
page_name = "home.md" page_name = "home.md"
@@ -115,8 +113,8 @@ class WikisView(APIView):
page_name, request.user.username) page_name, request.user.username)
except SearpcError as e: except SearpcError as e:
logger.error(e) logger.error(e)
error_msg = 'Internal Server Error' msg = 'Internal Server Error'
return api_error(status.HTTP_500_INTERNAL_SERVER_ERROR, error_msg) return api_error(status.HTTP_500_INTERNAL_SERVER_ERROR, msg)
return Response(wiki.to_dict()) return Response(wiki.to_dict())

4
tests/api/endpoints/test_wikis.py
View File

@@ -31,6 +31,8 @@ class WikisViewTest(BaseTestCase):
assert json_resp['data'][0]['name'] == wiki.name assert json_resp['data'][0]['name'] == wiki.name
assert 'wikis/test-wiki' in json_resp['data'][0]['link'] assert 'wikis/test-wiki' in json_resp['data'][0]['link']
assert json_resp['data'][0]['owner'] == self.user.username assert json_resp['data'][0]['owner'] == self.user.username
print json_resp['data'][0]['created_at']
assert json_resp['data'][0]['created_at'] is not None
def test_can_list_others(self): def test_can_list_others(self):
self.logout() self.logout()
@@ -64,6 +66,8 @@ class WikisViewTest(BaseTestCase):
self.assertEqual(200, resp.status_code) self.assertEqual(200, resp.status_code)
assert len(Wiki.objects.all()) == 1 assert len(Wiki.objects.all()) == 1
w = Wiki.objects.all()[0]
assert w.created_at is not None
class WikiViewTest(BaseTestCase): class WikiViewTest(BaseTestCase):