haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-25 14:50:29 +00:00
Code Issues Releases Wiki Activity

add share/upload link token and department name in dpt owned repo (#4212)

Browse Source
This commit is contained in:
Leo
2019-10-30 17:51:21 +08:00
committed by Daniel Pan
parent 0640623846
commit b4772b19d1
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
seahub/api2/endpoints/admin/users.py
View File

@@ -44,6 +44,8 @@ from seahub.institutions.models import Institution
from seahub.avatar.templatetags.avatar_tags import api_avatar_url from seahub.avatar.templatetags.avatar_tags import api_avatar_url
from seahub.admin_log.signals import admin_operation from seahub.admin_log.signals import admin_operation
from seahub.admin_log.models import USER_DELETE, USER_ADD from seahub.admin_log.models import USER_DELETE, USER_ADD
from seahub.api2.endpoints.group_owned_libraries import get_group_id_by_repo_owner
from seahub.group.utils import group_id_to_name
from seahub.options.models import UserOptions from seahub.options.models import UserOptions
from seahub.share.models import FileShare, UploadLinkShare from seahub.share.models import FileShare, UploadLinkShare
@@ -70,6 +72,7 @@ def get_user_upload_link_info(uls):
data['repo_name'] = repo.repo_name if repo else '' data['repo_name'] = repo.repo_name if repo else ''
data['path'] = path data['path'] = path
data['token'] = uls.token
data['obj_name'] = obj_name data['obj_name'] = obj_name
data['view_cnt'] = uls.view_cnt data['view_cnt'] = uls.view_cnt
@@ -93,6 +96,7 @@ def get_user_share_link_info(fileshare):
obj_name = '' obj_name = ''
data['repo_name'] = repo.repo_name if repo else '' data['repo_name'] = repo.repo_name if repo else ''
data['token'] = fileshare.token
data['path'] = path data['path'] = path
data['obj_name'] = obj_name data['obj_name'] = obj_name
@@ -949,9 +953,14 @@ class AdminUserBeSharedRepos(APIView):
# Use dict to reduce memcache fetch cost in large for-loop. # Use dict to reduce memcache fetch cost in large for-loop.
nickname_dict = {} nickname_dict = {}
owner_set = set([x.user for x in beshared_repos]) owner_set = set([x.user for x in beshared_repos])
for e in owner_set: for email in owner_set:
if e not in nickname_dict: if email not in nickname_dict:
nickname_dict[e] = email2nickname(e) if '@seafile_group' in email:
group_id = get_group_id_by_repo_owner(email)
group_name= group_id_to_name(group_id)
nickname_dict[email] = group_name
else:
nickname_dict[email] = email2nickname(email)
repos_info = [] repos_info = []
for repo in beshared_repos: for repo in beshared_repos: