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

[api2] Add root id back when list repos

Browse Source
This commit is contained in:
zhengxie
2015-04-02 11:26:09 +08:00
committed by Daniel Pan
parent c4dabb0220
commit f30cb39ef5
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
seahub/api2/views.py
View File

@@ -544,6 +544,7 @@ class Repos(APIView):
"encrypted": r.encrypted, "encrypted": r.encrypted,
"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,
} }
if r.encrypted: if r.encrypted:
repo["enc_version"] = r.enc_version repo["enc_version"] = r.enc_version
@@ -584,6 +585,7 @@ class Repos(APIView):
"encrypted": r.encrypted, "encrypted": r.encrypted,
"permission": 'rw', "permission": 'rw',
"virtual": r.is_virtual, "virtual": r.is_virtual,
"root": r.root,
} }
if r.encrypted: if r.encrypted:
repo["enc_version"] = r.enc_version repo["enc_version"] = r.enc_version
@@ -609,6 +611,7 @@ class Repos(APIView):
"encrypted": r.encrypted, "encrypted": r.encrypted,
"permission": r.user_perm, "permission": r.user_perm,
"share_type": r.share_type, "share_type": r.share_type,
"root": r.root,
} }
if r.encrypted: if r.encrypted:
repo["enc_version"] = r.enc_version repo["enc_version"] = r.enc_version
@@ -632,6 +635,7 @@ class Repos(APIView):
"size": r.size, "size": r.size,
"encrypted": r.encrypted, "encrypted": r.encrypted,
"permission": check_permission(r.id, email), "permission": check_permission(r.id, email),
"root": r.root,
} }
if r.encrypted: if r.encrypted:
repo["enc_version"] = r.enc_version repo["enc_version"] = r.enc_version
@@ -655,6 +659,7 @@ class Repos(APIView):
"permission": r.permission, "permission": r.permission,
"share_from": r.user, "share_from": r.user,
"share_type": r.share_type, "share_type": r.share_type,
"root": r.root,
} }
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

@@ -40,6 +40,7 @@ class ReposApiTest(ApiTestBase):
self.assertIsNotNone(repo['type']) self.assertIsNotNone(repo['type'])
# 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'])
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: