haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-08-25 10:11:24 +00:00
Code Issues Releases Wiki Activity

not show invalid perm when get all folder perm

Browse Source
This commit is contained in:
lian 2016-10-28 16:33:58 +08:00
parent ee3d19ff73
commit 7aac0745fa
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
seahub/views/ajax.py
View File

@ -21,7 +21,7 @@ from django.conf import settings as dj_settings
from django.template.defaultfilters import filesizeformat from django.template.defaultfilters import filesizeformat
import seaserv import seaserv
from seaserv import seafile_api, is_passwd_set, \ from seaserv import seafile_api, is_passwd_set, ccnet_api, \
get_related_users_by_repo, get_related_users_by_org_repo, \ get_related_users_by_repo, get_related_users_by_org_repo, \
seafserv_threaded_rpc, ccnet_threaded_rpc, edit_repo seafserv_threaded_rpc, ccnet_threaded_rpc, edit_repo
from pysearpc import SearpcError from pysearpc import SearpcError
@ -1662,21 +1662,32 @@ def get_folder_perm_by_path(request, repo_id):
user_result_perms = [] user_result_perms = []
for user_perm in user_perms: for user_perm in user_perms:
user_email = user_perm.user
try:
User.objects.get(email=user_email)
except User.DoesNotExist:
continue
if path == user_perm.path: if path == user_perm.path:
user_result_perm = { user_result_perm = {
"perm": user_perm.permission, "perm": user_perm.permission,
"user": user_perm.user, "user": user_email,
"user_name": email2nickname(user_perm.user), "user_name": email2nickname(user_email),
} }
user_result_perms.append(user_result_perm) user_result_perms.append(user_result_perm)
group_result_perms = [] group_result_perms = []
for group_perm in group_perms: for group_perm in group_perms:
group_id = group_perm.group_id
group = ccnet_api.get_group(group_id)
if not group:
continue
if path == group_perm.path: if path == group_perm.path:
group_result_perm = { group_result_perm = {
"perm": group_perm.permission, "perm": group_perm.permission,
"group_id": group_perm.group_id, "group_id": group_id,
"group_name": get_group(group_perm.group_id).group_name, "group_name": group.group_name,
} }
group_result_perms.append(group_result_perm) group_result_perms.append(group_result_perm)