From 7106c42fefe302b78ee7ee9018192e0b080b8112 Mon Sep 17 00:00:00 2001
From: zhengxie <xiez1989@gmail.com>
Date: Sat, 30 Mar 2013 16:20:27 +0800
Subject: [PATCH] Improve group discuss, change email to nickname or id

---
 base/templatetags/seahub_tags.py            | 11 -----------
 group/templates/group/group_discuss.html    |  6 +++---
 profile/templates/profile/user_profile.html |  2 --
 profile/views.py                            |  9 +++++++--
 4 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/base/templatetags/seahub_tags.py b/base/templatetags/seahub_tags.py
index 968df5523c..6da36a177c 100644
--- a/base/templatetags/seahub_tags.py
+++ b/base/templatetags/seahub_tags.py
@@ -204,17 +204,6 @@ def translate_seahub_time(value):
     else:
         return _('Just now')
     
-# @register.filter(name='translate_remain_time')
-# def translate_remain_time(value):
-#     if value > 24 * 60 * 60:
-#         return u'%d 天' % (value/24/3600)
-#     elif value > 60 * 60:
-#         return u'%d 小时' % (value/3600)
-#     elif value > 60:
-#         return u'%d 分钟' % (value/60)
-#     else:
-#         return u'%d 秒' % (value)
-
 @register.filter(name='email2nickname')
 def email2nickname(value):
     """
diff --git a/group/templates/group/group_discuss.html b/group/templates/group/group_discuss.html
index d85cad26bd..4894fd70cd 100644
--- a/group/templates/group/group_discuss.html
+++ b/group/templates/group/group_discuss.html
@@ -67,14 +67,14 @@
     <ul class="msg-list">
     {% for msg in group_msgs.object_list %}
         <li class="msg w100 ovhd">
-        <a href="{% url 'user_profile' msg.from_email %}" class="pic fleft">{% avatar msg.from_email 48 %}</a>
+        <a href="{% url 'user_profile' msg.from_email|email2id %}" class="pic fleft">{% avatar msg.from_email 48 %}</a>
         <div class="txt fright">
             <div class="msg-main">
                 <div class="msg-hd w100 ovhd">
                     {% if is_staff or msg.from_email == request.user.username %}
                     <span class="msg-del op fright vh" data-url="{% url 'group_message_remove' group.id msg.id %}">{% trans "Delete" %}</span>
                     {% endif %}
-                    <a href="{{ SITE_ROOT }}profile/{{ msg.from_email|email2id }}/" title="{{ msg.from_email }}" class="author">{{ msg.from_email|email2nickname }}</a>
+                    <a href="{{ SITE_ROOT }}profile/{{ msg.from_email|email2id }}/" title="{{ msg.from_email|email2nickname }}" class="author">{{ msg.from_email|email2nickname }}</a>
                     <span class="time">{{ msg.timestamp|translate_seahub_time }}</span>
                 </div>
                 <p class="msg-con">{{ msg.message|seahub_urlize|find_at|linebreaksbr }}</p>
@@ -120,7 +120,7 @@
                 <ul class="reply-list">
                     {% for r in msg.replies %}
                     <li class="reply w100 ovhd">
-                    <a href="{% url 'user_profile' r.from_email %}" class="pic fleft">{% avatar r.from_email 28 %}</a>
+                    <a href="{% url 'user_profile' r.from_email|email2id %}" class="pic fleft">{% avatar r.from_email 28 %}</a>
                     <div class="txt fright">
                         <a href="{{ SITE_ROOT }}profile/{{ r.from_email|email2id }}/">{{ r.from_email|email2nickname }}</a>
                         <span class="time">{{ r.timestamp|translate_seahub_time }}</span>
diff --git a/profile/templates/profile/user_profile.html b/profile/templates/profile/user_profile.html
index ffcd0ede04..3cb1e58dd3 100644
--- a/profile/templates/profile/user_profile.html
+++ b/profile/templates/profile/user_profile.html
@@ -18,8 +18,6 @@
     <div class="txt fright">
         {% if nickname %}
         <p>{{ nickname }}</p>
-        {% else %}
-        <p>{{ email|email2nickname }}</p>
         {% endif %}
 
         {% if intro %}
diff --git a/profile/views.py b/profile/views.py
index ff205fe940..73a8e0036f 100644
--- a/profile/views.py
+++ b/profile/views.py
@@ -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))