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

Merge pull request #1206 from haiwen/head-commt-id

Browse Source 
return head commit id info from repos api
This commit is contained in:
Daniel Pan 2016-05-21 13:27:48 +08:00
commit ce2648e646
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
seahub/api2/views.py
View File

@ -560,6 +560,7 @@ class Repos(APIView):
"permission": 'rw', # Always have read-write permission to owned repo "permission": 'rw', # Always have read-write permission to owned repo
"virtual": r.is_virtual, "virtual": r.is_virtual,
"root": r.root, "root": r.root,
"head_commit_id": r.head_cmmt_id,
} }
if r.encrypted: if r.encrypted:
repo["enc_version"] = r.enc_version repo["enc_version"] = r.enc_version
@ -594,6 +595,7 @@ class Repos(APIView):
"permission": 'rw', "permission": 'rw',
"virtual": r.is_virtual, "virtual": r.is_virtual,
"root": r.root, "root": r.root,
"head_commit_id": r.head_cmmt_id,
} }
if r.encrypted: if r.encrypted:
repo["enc_version"] = r.enc_version repo["enc_version"] = r.enc_version
@ -621,6 +623,7 @@ class Repos(APIView):
"permission": r.user_perm, "permission": r.user_perm,
"share_type": r.share_type, "share_type": r.share_type,
"root": r.root, "root": r.root,
"head_commit_id": r.head_cmmt_id,
} }
if r.encrypted: if r.encrypted:
repo["enc_version"] = r.enc_version repo["enc_version"] = r.enc_version
@ -645,6 +648,7 @@ class Repos(APIView):
"encrypted": r.encrypted, "encrypted": r.encrypted,
"permission": check_permission(r.id, email), "permission": check_permission(r.id, email),
"root": r.root, "root": r.root,
"head_commit_id": r.head_cmmt_id,
} }
if r.encrypted: if r.encrypted:
repo["enc_version"] = r.enc_version repo["enc_version"] = r.enc_version
@ -670,6 +674,7 @@ class Repos(APIView):
"share_from": r.user, "share_from": r.user,
"share_type": r.share_type, "share_type": r.share_type,
"root": r.root, "root": r.root,
"head_commit_id": r.head_cmmt_id,
} }
if r.encrypted: if r.encrypted:
repo["enc_version"] = r.enc_version repo["enc_version"] = r.enc_version

1
tests/api/test_repos.py
View File

@ -42,6 +42,7 @@ class ReposApiTest(ApiTestBase):
# self.assertIsNotNone(repo['virtual']) #allow null for pub-repo # self.assertIsNotNone(repo['virtual']) #allow null for pub-repo
self.assertIsNotNone(repo['desc']) self.assertIsNotNone(repo['desc'])
self.assertIsNotNone(repo['root']) self.assertIsNotNone(repo['root'])
self.assertIsNotNone(repo['head_commit_id'])
def test_get_repo_info(self): def test_get_repo_info(self):
with self.get_tmp_repo() as repo: with self.get_tmp_repo() as repo: