From 00f3574993887ff6c55de7045d2db57adfa96994 Mon Sep 17 00:00:00 2001 From: lian Date: Thu, 14 May 2015 17:22:19 +0800 Subject: [PATCH] update org bug --- seahub/api2/views.py | 2 +- seahub/views/ajax.py | 20 +++++++++++++++++--- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/seahub/api2/views.py b/seahub/api2/views.py index cdefdabb9f..1056207d53 100644 --- a/seahub/api2/views.py +++ b/seahub/api2/views.py @@ -3135,7 +3135,7 @@ class GroupRepos(APIView): username = request.user.username if is_org_context(request): 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: repos = seafile_api.get_repos_by_group(group.id) diff --git a/seahub/views/ajax.py b/seahub/views/ajax.py index aae2583593..c2b1c3b1c7 100644 --- a/seahub/views/ajax.py +++ b/seahub/views/ajax.py @@ -1290,7 +1290,11 @@ def sub_repo(request, repo_id): content_type=content_type) # perm check, only repo owner can create sub repo - repo_owner = seafile_api.get_repo_owner(origin_repo.id) + 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) + is_repo_owner = True if username == repo_owner else False if not is_repo_owner: 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')}), 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')}), 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')}), 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')}), status=403, content_type=content_type)