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

Add name to user object

Browse Source
This commit is contained in:
zhengxie
2019-01-19 15:23:45 +08:00
parent bbfa510fd5
commit 3627b13dcb
2 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
seahub/base/accounts.py
View File

@@ -278,11 +278,17 @@ class User(object):
@property @property
def contact_email(self): def contact_email(self):
if not hasattr(self, '_cached_contact_email'): if not hasattr(self, '_cached_contact_email'):
email = Profile.objects.get_contact_email_by_user(self.username) self._cached_contact_email = email2contact_email(self.username)
self._cached_contact_email = email
return self._cached_contact_email return self._cached_contact_email
@property
def name(self):
if not hasattr(self, '_cached_nickname'):
self._cached_nickname = email2nickname(self.username)
return self._cached_nickname
class DoesNotExist(Exception): class DoesNotExist(Exception):
pass pass
@@ -842,3 +848,7 @@ class DetailedRegistrationForm(RegistrationForm):
note = forms.CharField(widget=forms.TextInput( note = forms.CharField(widget=forms.TextInput(
attrs=dict(attrs_dict, maxlength=100)), label=_("note"), attrs=dict(attrs_dict, maxlength=100)), label=_("note"),
required=note_required) required=note_required)
# Move here to avoid circular import
from seahub.base.templatetags.seahub_tags import email2nickname, \
email2contact_email

12
seahub/views/sysadmin.py
View File

@@ -32,7 +32,8 @@ from seahub.base.accounts import User
from seahub.base.models import UserLastLogin from seahub.base.models import UserLastLogin
from seahub.base.decorators import sys_staff_required, require_POST from seahub.base.decorators import sys_staff_required, require_POST
from seahub.base.sudo_mode import update_sudo_mode_ts from seahub.base.sudo_mode import update_sudo_mode_ts
from seahub.base.templatetags.seahub_tags import tsstr_sec, email2nickname from seahub.base.templatetags.seahub_tags import tsstr_sec, email2nickname, \
email2contact_email
from seahub.auth import authenticate from seahub.auth import authenticate
from seahub.auth.decorators import login_required, login_required_ajax from seahub.auth.decorators import login_required, login_required_ajax
from seahub.constants import GUEST_USER, DEFAULT_USER, DEFAULT_ADMIN, \ from seahub.constants import GUEST_USER, DEFAULT_USER, DEFAULT_ADMIN, \
@@ -226,13 +227,8 @@ def can_view_sys_admin_repo(repo):
def populate_user_info(user): def populate_user_info(user):
"""Populate contact email and name to user. """Populate contact email and name to user.
""" """
user_profile = Profile.objects.get_profile_by_user(user.email) user.contact_email = email2contact_email(user.email)
if user_profile: user.name = email2nickname(user.email)
user.contact_email = user_profile.contact_email
user.name = user_profile.nickname
else:
user.contact_email = ''
user.name = ''
def _populate_user_quota_usage(user): def _populate_user_quota_usage(user):
"""Populate space/share quota to user. """Populate space/share quota to user.