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

Improve group discuss, change email to nickname or id

Browse Source
This commit is contained in:
zhengxie
2013-03-30 16:20:27 +08:00
parent f6738b625f
commit 7106c42fef
4 changed files with 10 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
profile/views.py
View File

@@ -59,7 +59,6 @@ def edit_profile(request):
'form': form,
}, context_instance=RequestContext(request))
@login_required
def user_profile(request, username_or_id):
user_nickname = ''
user_intro = ''
@@ -84,12 +83,18 @@ def user_profile(request, username_or_id):
profile = profile[0]
user_nickname = profile.nickname
user_intro = profile.intro
else:
username = user.username
idx = username.find('@')
user_nickname = username if idx <= 0 else username[:idx]
user_intro = ''
else:
user_nickname = ""
user_intro = _(u'Has not accepted invitation yet')
return render_to_response('profile/user_profile.html', {
'email': user.username,
# 'email': user.username,
'user': user,
'nickname': user_nickname,
'intro': user_intro,
}, context_instance=RequestContext(request))