diff --git a/seahub/profile/templates/profile/set_profile.html b/seahub/profile/templates/profile/set_profile.html index c294d17274..759cd41f91 100644 --- a/seahub/profile/templates/profile/set_profile.html +++ b/seahub/profile/templates/profile/set_profile.html @@ -58,12 +58,6 @@
{% endif %} - - {% for error in form.intro.errors %} - {{ error|escape }} - {% endfor %} -
- {% if form.department and form.telephone %} {% for error in form.department.errors %} diff --git a/seahub/profile/templates/profile/user_profile.html b/seahub/profile/templates/profile/user_profile.html index e02abf642b..1b9057b9e4 100644 --- a/seahub/profile/templates/profile/user_profile.html +++ b/seahub/profile/templates/profile/user_profile.html @@ -9,9 +9,6 @@ {% avatar "" 290 %} {% endif %}

{{ nickname }}

- {% if intro %} -

{{ intro }}

- {% endif %} {% if d_profile %} {% if d_profile.department %}

diff --git a/seahub/profile/views.py b/seahub/profile/views.py index 747c33b147..eea3f41a1a 100644 --- a/seahub/profile/views.py +++ b/seahub/profile/views.py @@ -50,7 +50,6 @@ def edit_profile(request): init_dict = {} if profile: init_dict['nickname'] = profile.nickname - init_dict['intro'] = profile.intro init_dict['login_id'] = profile.login_id init_dict['contact_email'] = profile.contact_email if d_profile: @@ -100,18 +99,14 @@ def user_profile(request, username): nickname = '' if user is None else email2nickname(user.username) 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( user.username) else: - intro = _(u'Has not accepted invitation yet') d_profile = None return render_to_response('profile/user_profile.html', { 'user': user, 'nickname': nickname, - 'intro': intro, 'd_profile': d_profile, }, context_instance=RequestContext(request)) diff --git a/seahub/templates/sysadmin/userinfo.html b/seahub/templates/sysadmin/userinfo.html index 683ddd2019..5ea6bbe43e 100644 --- a/seahub/templates/sysadmin/userinfo.html +++ b/seahub/templates/sysadmin/userinfo.html @@ -28,9 +28,6 @@ {% if profile %}

{% trans "Name" context "true name" %}
{{ profile.nickname }}
- -
{% trans "Self-introduction" %}
-
{{ profile.intro }}
{% endif %} {% if d_profile %}