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

[inst] Update user table

Browse Source
This commit is contained in:
zhengxie
2016-08-08 18:19:00 +08:00
parent 06022c3109
commit e48ae64576
4 changed files with 26 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
seahub/views/sysadmin.py
View File

@@ -112,6 +112,17 @@ def can_view_sys_admin_repo(repo):
else:
return False
def populate_user_info(user):
"""Populate contact email and nickname to user.
"""
user_profile = Profile.objects.get_profile_by_user(user.email)
if user_profile:
user.contact_email = user_profile.contact_email
user.name = user_profile.nickname
else:
user.contact_email = ''
user.name = ''
def _populate_user_quota_usage(user):
"""Populate space/share quota to user.
@@ -190,17 +201,10 @@ def sys_user_admin(request):
else:
trial_users = []
for user in users:
user_profile = Profile.objects.get_profile_by_user(user.email)
if user_profile:
user.contact_email = user_profile.contact_email
user.name = user_profile.nickname
else:
user.contact_email = ''
user.name = ''
if user.email == request.user.email:
user.is_self = True
populate_user_info(user)
_populate_user_quota_usage(user)
# check user's role
@@ -1458,16 +1462,9 @@ def user_search(request):
else:
trial_users = []
for user in users:
populate_user_info(user)
_populate_user_quota_usage(user)
user_profile = Profile.objects.get_profile_by_user(user.email)
if user_profile:
user.contact_email = user_profile.contact_email
user.name = user_profile.nickname
else:
user.contact_email = ''
user.name = ''
# check user's role
if user.role == GUEST_USER:
user.is_guest = True