From 11afcaf17c09d968400bbe1a21e5ebc356f2fdb2 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Sat, 1 Aug 2015 15:14:45 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B2=A1=E6=9C=89=E6=98=B5=E7=A7=B0=E7=9A=84?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=98=BE=E7=A4=BA=E4=B8=BA=EF=BC=9A=E5=8C=BF?=
 =?UTF-8?q?=E5=90=8D=E7=94=A8=E6=88=B7=20=E4=B8=AA=E4=BA=BA=E4=B8=BB?=
 =?UTF-8?q?=E9=A1=B5=E7=95=99=E8=A8=80=E6=8D=A2=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/user.rb                        | 2 +-
 app/views/users/_user_jour_reply.html.erb | 4 ++--
 app/views/users/_user_jours_new.html.erb  | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/models/user.rb b/app/models/user.rb
index 005c394a8..2271adc18 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -418,7 +418,7 @@ class User < Principal
   end
 
   def nickname(formatter = nil)
-    login
+    login.nil? || (login && login.empty?) ? "AnonymousUser" : login
   end
 
   def name(formatter = nil)
diff --git a/app/views/users/_user_jour_reply.html.erb b/app/views/users/_user_jour_reply.html.erb
index ee94cb35a..60eda9fcd 100644
--- a/app/views/users/_user_jour_reply.html.erb
+++ b/app/views/users/_user_jour_reply.html.erb
@@ -3,9 +3,9 @@
     <div class="mes_box02" id = '<%= reply.id %>'>
       <%= link_to image_tag(url_to_avatar(reply.user),:width => '32',:height => '32'), user_path(reply.user),:class => "users_pic_sub fl mr5" %>
       <div class=" mes_box02_info fl">
-        <%= link_to "#{reply.user.login}&nbsp;".html_safe, user_path(reply.user),:class => 'course_name fl c_blue02 ', :target => "_blank"%>
+        <%= link_to "#{reply.user.nickname}&nbsp;".html_safe, user_path(reply.user),:class => 'course_name fl c_blue02 ', :target => "_blank"%>
         <span class="fl c_grey">&nbsp;回复&nbsp;</span>
-        <%= link_to "#{parent_jour.user.login}&nbsp;:&nbsp;".html_safe, user_path(parent_jour.user),:class => 'course_name fl c_blue02 mr5 ', :target => "_blank"%>
+        <%= link_to "#{parent_jour.user.nickname}&nbsp;:&nbsp;".html_safe, user_path(parent_jour.user),:class => 'course_name fl c_blue02 mr5 ', :target => "_blank"%>
         <div class="cl">
           <%= reply.notes.html_safe %>
         </div>
diff --git a/app/views/users/_user_jours_new.html.erb b/app/views/users/_user_jours_new.html.erb
index 9a9e14787..0fe301641 100644
--- a/app/views/users/_user_jours_new.html.erb
+++ b/app/views/users/_user_jours_new.html.erb
@@ -1,8 +1,8 @@
-<div class="message_list" id="<%= jour.id %>" nhname="rec" data-id="<%= jour.id %>">
+<div class="message_list break_word" id="<%= jour.id %>" nhname="rec" data-id="<%= jour.id %>">
   <%= link_to image_tag(url_to_avatar(jour.user),:width => '46',:height => '46'), user_path(jour.user),:class => "users_pic fl" %>
   <div class="fl ml5 mes_box mb10" >
     <div>
-      <%= link_to "#{jour.user.login}&nbsp;:&nbsp;".html_safe, user_path(jour.user),:class => 'fl c_blue02 f14 fb mb5', :target => "_blank"%>
+      <%= link_to "#{jour.user.nickname}&nbsp;:&nbsp;".html_safe, user_path(jour.user),:class => 'fl c_blue02 f14 fb mb5', :target => "_blank"%>
     </div>
     <div class="cl"></div>
     <div>