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

[lib setting] folder perm: add 'add folder', bugfix & etc.

Browse Source
This commit is contained in:
llj
2016-02-29 17:01:12 +08:00
parent 442753f96a
commit b90c3d5bf7
5 changed files with 218 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
seahub/api2/views.py
View File

@@ -4421,7 +4421,7 @@ class RepoUserFolderPerm(APIView):
result['user_email'] = perm.user
result['user_name'] = email2nickname(perm.user)
result['folder_path'] = perm.path
result['folder_name'] = os.path.basename(perm.path.rstrip('/'))
result['folder_name'] = perm.path if perm.path == '/' else os.path.basename(perm.path.rstrip('/'))
result['permission'] = perm.permission
results.append(result)
@@ -4519,7 +4519,7 @@ def get_repo_group_folder_perm_result(repo_id, path, group_id):
result['group_id'] = group_id
result['group_name'] = group.group_name
result['folder_path'] = path
result['folder_name'] = os.path.basename(path.rstrip('/'))
result['folder_name'] = path if path == '/' else os.path.basename(path.rstrip('/'))
result['permission'] = permission
return result
@@ -4545,7 +4545,7 @@ class RepoGroupFolderPerm(APIView):
result['group_id'] = perm.group_id
result['group_name'] = group.group_name
result['folder_path'] = perm.path
result['folder_name'] = os.path.basename(perm.path.rstrip('/'))
result['folder_name'] = perm.path if perm.path == '/' else os.path.basename(perm.path.rstrip('/'))
result['permission'] = perm.permission
results.append(result)