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

rm user intro at admin-user-info/profile page

Browse Source
This commit is contained in:
lian 2016-02-20 17:50:47 +08:00
parent 4179a13c4c
commit 738bd52f7a
4 changed files with 0 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
seahub/profile/templates/profile/set_profile.html
View File

@ -58,12 +58,6 @@
<br/> <br/>
{% endif %} {% endif %}
<label>{% trans "About me:" %}</label><textarea name="intro" class="textarea">{{ form.data.intro }}</textarea>
{% for error in form.intro.errors %}
<span class="error">{{ error|escape }}</span>
{% endfor %}
<br/>
{% if form.department and form.telephone %} {% if form.department and form.telephone %}
<label>{% trans "Department:" %}</label><input type="text" name="department" value="{{ form.data.department }}" class="input" /> <label>{% trans "Department:" %}</label><input type="text" name="department" value="{{ form.data.department }}" class="input" />
{% for error in form.department.errors %} {% for error in form.department.errors %}

3
seahub/profile/templates/profile/user_profile.html
View File

@ -9,9 +9,6 @@
{% avatar "" 290 %} {% avatar "" 290 %}
{% endif %} {% endif %}
<p title="{{ nickname }}" class="nickname ellipsis">{{ nickname }}</p> <p title="{{ nickname }}" class="nickname ellipsis">{{ nickname }}</p>
{% if intro %}
<p class="intro">{{ intro }}</p>
{% endif %}
{% if d_profile %} {% if d_profile %}
{% if d_profile.department %} {% if d_profile.department %}
<p title="{{ d_profile.department }}" class="info ellipsis"> <p title="{{ d_profile.department }}" class="info ellipsis">

5
seahub/profile/views.py
View File

@ -50,7 +50,6 @@ def edit_profile(request):
init_dict = {} init_dict = {}
if profile: if profile:
init_dict['nickname'] = profile.nickname init_dict['nickname'] = profile.nickname
init_dict['intro'] = profile.intro
init_dict['login_id'] = profile.login_id init_dict['login_id'] = profile.login_id
init_dict['contact_email'] = profile.contact_email init_dict['contact_email'] = profile.contact_email
if d_profile: if d_profile:
@ -100,18 +99,14 @@ def user_profile(request, username):
nickname = '' if user is None else email2nickname(user.username) nickname = '' if user is None else email2nickname(user.username)
if user is not None: if user is not None:
profile = Profile.objects.get_profile_by_user(user.username)
intro = profile.intro if profile else ''
d_profile = DetailedProfile.objects.get_detailed_profile_by_user( d_profile = DetailedProfile.objects.get_detailed_profile_by_user(
user.username) user.username)
else: else:
intro = _(u'Has not accepted invitation yet')
d_profile = None d_profile = None
return render_to_response('profile/user_profile.html', { return render_to_response('profile/user_profile.html', {
'user': user, 'user': user,
'nickname': nickname, 'nickname': nickname,
'intro': intro,
'd_profile': d_profile, 'd_profile': d_profile,
}, context_instance=RequestContext(request)) }, context_instance=RequestContext(request))

3
seahub/templates/sysadmin/userinfo.html
View File

@ -28,9 +28,6 @@
{% if profile %} {% if profile %}
<dt>{% trans "Name" context "true name" %}</dt> <dt>{% trans "Name" context "true name" %}</dt>
<dd>{{ profile.nickname }}</dd> <dd>{{ profile.nickname }}</dd>
<dt>{% trans "Self-introduction" %}</dt>
<dd>{{ profile.intro }}</dd>
{% endif %} {% endif %}
{% if d_profile %} {% if d_profile %}