From 32dca93b596f409fbdb84a38b717f265db2dcd4a Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Wed, 1 Jun 2016 15:35:26 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=9F=E4=B8=80=E9=A1=B9=E7=9B=AE=E5=8F=8D?=
 =?UTF-8?q?=E9=A6=88=E3=80=81=E8=AF=BE=E7=A8=8B=E7=95=99=E8=A8=80=E3=80=81?=
 =?UTF-8?q?=E8=AE=A8=E8=AE=BA=E5=8C=BA=E7=9A=84=E5=9B=9E=E5=A4=8D=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=EF=BC=9A=E6=98=BE=E7=A4=BA=E7=95=99=E8=A8=80=E8=80=85?=
 =?UTF-8?q?=E5=A7=93=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/messages_controller.rb        | 2 +-
 app/views/courses/_history.html.erb           | 2 +-
 app/views/projects/_history.html.erb          | 2 +-
 app/views/words/_journal_reply_items.html.erb | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/controllers/messages_controller.rb b/app/controllers/messages_controller.rb
index b1d16debb..8ef399d10 100644
--- a/app/controllers/messages_controller.rb
+++ b/app/controllers/messages_controller.rb
@@ -304,7 +304,7 @@ class MessagesController < ApplicationController
 
     @content = "> #{ll(Setting.default_language, :text_user_wrote, @message.author)}\n> "
     @temp = Message.new
-    @temp.content = "<blockquote>#{ll(Setting.default_language, :text_user_wrote, @message.author)} <br/>#{@message.content.html_safe}</blockquote>".html_safe
+    @temp.content = "<blockquote>#{ll(Setting.default_language, :text_user_wrote, @message.author.show_name)} <br/>#{@message.content.html_safe}</blockquote>".html_safe
   end
 
   def preview
diff --git a/app/views/courses/_history.html.erb b/app/views/courses/_history.html.erb
index 7f016d046..067064c07 100644
--- a/app/views/courses/_history.html.erb
+++ b/app/views/courses/_history.html.erb
@@ -9,7 +9,7 @@
             <div class="ping_distop f14">
               <!-- <a style=" font-weight:bold; color:#15bccf; margin-right:30px; background:none;" target="_blank" href="#">gugu01</a> -->
                   <span>
-                    <%= link_to "#{journal.user.show_name}(#{journal.user.login})", user_path(journal.user),:class => 'c_blue fb fl mb10 f14', :target => "_blank"%>
+                    <%= link_to journal.user.show_name, user_path(journal.user),:class => 'c_blue fb fl mb10 f14', :target => "_blank"%>
                   </span>
                   <span class="c_grey fr f14">
                     <%= format_time(journal.created_on) %>
diff --git a/app/views/projects/_history.html.erb b/app/views/projects/_history.html.erb
index 4f7fb7f4a..e5c03628c 100644
--- a/app/views/projects/_history.html.erb
+++ b/app/views/projects/_history.html.erb
@@ -6,7 +6,7 @@
               <div class="ping_discon" style="width: 610px;">
                 <div class="ping_distop f14">
                   <!-- <a style=" font-weight:bold; color:#15bccf; margin-right:30px; background:none;" target="_blank" href="#">gugu01</a> -->
-                  <span><%= link_to journal.user, user_path(journal.user), :class => 'c_blue fb fl mb10 f14', :target => "_blank" %>
+                  <span><%= link_to journal.user.show_name, user_path(journal.user), :class => 'c_blue fb fl mb10 f14', :target => "_blank" %>
                   </span><span class="c_grey fr f14"><%= format_time(journal.created_on) %></span>
                   <div class="cl"></div>
                   <!--<p><%#= textilizable journal.notes%></p>-->
diff --git a/app/views/words/_journal_reply_items.html.erb b/app/views/words/_journal_reply_items.html.erb
index dc7cdc5fc..8a2c14e07 100644
--- a/app/views/words/_journal_reply_items.html.erb
+++ b/app/views/words/_journal_reply_items.html.erb
@@ -13,10 +13,10 @@
       </div>
       <div class="recall_con f14">
         <% id = 'project_respond_form_'+ reply.id.to_s %>
-        <%= link_to "#{reply.user.show_name}(#{reply.user.login})", user_path(reply.user) %>
+        <%= link_to reply.user.show_name, user_path(reply.user) %>
         <%= l(:label_reply_to)%>
         <% if show_name %>
-            <%= link_to "#{parent_jour.user.show_name}(#{parent_jour.user.login})", user_path(parent_jour.user) %>
+            <%= link_to parent_jour.user.show_name, user_path(parent_jour.user) %>
         <% else %>
             <%= l(:label_anonymous) %>
         <% end %>