haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-23 20:37:42 +00:00
Code Issues Releases Wiki Activity

update org bug

Browse Source
This commit is contained in:
lian
2015-05-14 17:22:19 +08:00
parent 53d0f730b8
commit 00f3574993
2 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
seahub/api2/views.py
View File

@@ -3135,7 +3135,7 @@ class GroupRepos(APIView):
username = request.user.username username = request.user.username
if is_org_context(request): if is_org_context(request):
org_id = request.user.org.org_id org_id = request.user.org.org_id
repos = seaserv.get_org_group_repos(org_id, group.id, username) repos = seafile_api.get_org_group_repos(org_id, group.id)
else: else:
repos = seafile_api.get_repos_by_group(group.id) repos = seafile_api.get_repos_by_group(group.id)

18
seahub/views/ajax.py
View File

@@ -1290,7 +1290,11 @@ def sub_repo(request, repo_id):
content_type=content_type) content_type=content_type)
# perm check, only repo owner can create sub repo # perm check, only repo owner can create sub repo
if is_org_context(request):
repo_owner = seafile_api.get_org_repo_owner(origin_repo.id)
else:
repo_owner = seafile_api.get_repo_owner(origin_repo.id) repo_owner = seafile_api.get_repo_owner(origin_repo.id)
is_repo_owner = True if username == repo_owner else False is_repo_owner = True if username == repo_owner else False
if not is_repo_owner: if not is_repo_owner:
result['error'] = _(u"You do not have permission to create library") result['error'] = _(u"You do not have permission to create library")
@@ -2312,7 +2316,12 @@ def set_user_folder_perm(request, repo_id):
return HttpResponse(json.dumps({"error": _('Library does not exist')}), return HttpResponse(json.dumps({"error": _('Library does not exist')}),
status=400, content_type=content_type) status=400, content_type=content_type)
if username != seafile_api.get_repo_owner(repo_id): if is_org_context(request):
repo_owner = seafile_api.get_org_repo_owner(repo_id)
else:
repo_owner = seafile_api.get_repo_owner(repo_id)
if username != repo_owner:
return HttpResponse(json.dumps({"error": _('Permission denied')}), return HttpResponse(json.dumps({"error": _('Permission denied')}),
status=403, content_type=content_type) status=403, content_type=content_type)
@@ -2449,7 +2458,12 @@ def set_group_folder_perm(request, repo_id):
return HttpResponse(json.dumps({"error": _('Library does not exist')}), return HttpResponse(json.dumps({"error": _('Library does not exist')}),
status=400, content_type=content_type) status=400, content_type=content_type)
if username != seafile_api.get_repo_owner(repo_id): if is_org_context(request):
repo_owner = seafile_api.get_org_repo_owner(repo_id)
else:
repo_owner = seafile_api.get_repo_owner(repo_id)
if username != repo_owner:
return HttpResponse(json.dumps({"error": _('Permission denied')}), return HttpResponse(json.dumps({"error": _('Permission denied')}),
status=403, content_type=content_type) status=403, content_type=content_type)