From 3e38b09219779b141eaade00ccc15bd1c82d7bfa Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Wed, 14 Sep 2016 10:42:30 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E5=8A=A8=E6=80=81=E9=99=84=E4=BB=B6=EF=BC=8C=E7=BB=84=E7=BB=87?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=EF=BC=8C=E8=B4=B4=E5=90=A7=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E4=BA=A4=E6=B5=81=EF=BC=8C=E8=B4=B4=E5=90=A7=E5=90=A7=E4=B8=BB?=
 =?UTF-8?q?=EF=BC=8C=E8=B4=B4=E5=90=A7=E5=8F=91=E5=B8=96=E4=BA=BA=EF=BC=8C?=
 =?UTF-8?q?=E8=B4=B4=E5=90=A7=E6=9C=80=E5=90=8E=E5=9B=9E=E5=A4=8D=EF=BC=8C?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2=E9=97=AE=E9=A2=98=E8=B7=9F?=
 =?UTF-8?q?=E8=B8=AA=EF=BC=8C=E9=A1=B9=E7=9B=AE=E5=8A=A8=E6=80=81=E7=9A=84?=
 =?UTF-8?q?=E6=8C=87=E6=B4=BE=E7=9A=84=E5=9C=B0=E6=96=B9=E7=9A=84=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E6=94=B9=E4=B8=BA=E6=98=BE=E7=A4=BA=E7=94=A8=E6=88=B7?=
 =?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/helpers/application_helper.rb               | 8 ++++++--
 app/helpers/issues_helper.rb                    | 4 ++--
 app/views/attachments/_activity_attach.html.erb | 5 +++--
 app/views/forums/_forum_list.html.erb           | 3 ++-
 app/views/forums/_show_topics.html.erb          | 2 +-
 app/views/issues/_detail.html.erb               | 2 +-
 app/views/layouts/base_forums.html.erb          | 3 ++-
 app/views/memos/show.html.erb                   | 2 +-
 app/views/users/_project_issue_detail.html.erb  | 2 +-
 app/views/users/user_organizations.html.erb     | 3 ++-
 10 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 94b0b2c6e..feb825e6b 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -345,7 +345,11 @@ module ApplicationHelper
 
   def link_to_isuue_user(user, options={})
     if user.is_a?(User)
-      name = h(user.name(options[:format]))
+      if options[:format]
+        name = h(user.name(options[:format]))
+      else
+        name = h(user.show_name)
+    end
       link_to name, {:controller=> 'users', :action => 'show', id: user.id, host: Setting.host_user}, :class => "pro_info_p"
     else
       h(user.to_s)
@@ -978,7 +982,7 @@ module ApplicationHelper
     groups = ''
     collection.sort.each do |element|
       selected_attribute = ' selected="selected"' if option_value_selected?(element, selected)
-      (element.is_a?(Group) ? groups : s) << %(<option value="#{element.id}"#{selected_attribute}>#{h element.name}</option>)
+      (element.is_a?(Group) ? groups : s) << %(<option value="#{element.id}"#{selected_attribute}>#{h element.show_name}</option>)
     end
     unless groups.empty?
       s << %(<optgroup label="#{h(l(:label_group_plural))}">#{groups}</optgroup>)
diff --git a/app/helpers/issues_helper.rb b/app/helpers/issues_helper.rb
index b161e29e9..5a124849f 100644
--- a/app/helpers/issues_helper.rb
+++ b/app/helpers/issues_helper.rb
@@ -111,9 +111,9 @@ module IssuesHelper
 
   def principals_options_for_isuue_list(project)
     if User.current.member_of?(project)
-      project.members.includes(:user).order("lower(users.login)").map{|c| [c.name, c.user_id]}.unshift(["<< #{l(:label_me)} >>", User.current.id]).unshift(["指派给", 0])
+      project.members.includes(:user).order("lower(users.login)").map{|c|  [User.find(c.user_id).show_name, c.user_id]}.unshift(["<< #{l(:label_me)} >>", User.current.id]).unshift(["指派给", 0])
     else
-      project.members.includes(:user).order("lower(users.login)").map{|c| [c.name, c.user_id]}.unshift(["指派给", 0])
+      project.members.includes(:user).order("lower(users.login)").map{|c| [User.find(c.user_id).show_name, c.user_id]}.unshift(["指派给", 0])
     end
   end
 
diff --git a/app/views/attachments/_activity_attach.html.erb b/app/views/attachments/_activity_attach.html.erb
index b37c80dad..b4c45b44c 100644
--- a/app/views/attachments/_activity_attach.html.erb
+++ b/app/views/attachments/_activity_attach.html.erb
@@ -9,8 +9,9 @@
           <span class="postAttSize">(
             <%= number_to_human_size attachment.filesize %>)
           </span>
-          <span class="author" title="<%= attachment.author%>">
-            <%= link_to h(truncate(attachment.author.name, length: 15, omission: '...')),user_path(attachment.author),:class => "c_orange" %>,
+          <% user_name = attachment.author.show_name.empty? ? attachment.author : attachment.author.show_name %>
+          <span class="author" title="<%= user_name %>">
+            <%= link_to h(truncate(user_name, length: 15, omission: '...')),user_path(attachment.author),:class => "c_orange" %>,
             <%= format_time(attachment.created_on) %>
           </span>
         </div>
diff --git a/app/views/forums/_forum_list.html.erb b/app/views/forums/_forum_list.html.erb
index ec9f4f7de..9a52fb410 100644
--- a/app/views/forums/_forum_list.html.erb
+++ b/app/views/forums/_forum_list.html.erb
@@ -11,7 +11,8 @@
                 <%#= link_to forum.name.gsub(/(\r\n|\s+)/,'<br/>'), forum_path(forum),:class=>"f16 linkBlue" %>
               </div>
               <div class="postDes"><%= textAreailizable forum.description%></div>
-              <div class="postCreater">创建者：<a href="<%= user_path( forum.creator)%>" class="linkGrey2" target="_blank"><%= forum.creator.name %></a></div>
+              <% user_name = forum.creator.show_name.empty? ? forum.creator.name : forum.creator.show_name %>
+              <div class="postCreater">创建者：<a href="<%= user_path( forum.creator)%>" class="linkGrey2" target="_blank"><%= user_name %></a></div>
               <div class="postDate">创建时间：<%= format_date(forum.created_at) %></div>
             </div>
             <div class="postStatics">
diff --git a/app/views/forums/_show_topics.html.erb b/app/views/forums/_show_topics.html.erb
index 11b1403cd..c3b8b4dbe 100644
--- a/app/views/forums/_show_topics.html.erb
+++ b/app/views/forums/_show_topics.html.erb
@@ -27,7 +27,7 @@
               </div>
               <% author = topic.last_reply.try(:author)%>
               <% if author%>
-                  <div class="postDetailCreater">最后回复：<a href="<%= user_path(author) %>" class="linkBlue2" target="_blank"><%= author.name%></a></div>
+                  <div class="postDetailCreater">最后回复：<a href="<%= user_path(author) %>" class="linkBlue2" target="_blank"><%= author.show_name%></a></div>
                   <div class="postDetailDate"><%= format_date(topic.last_reply.created_at)%></div>
               <% end%>
               <span class=" fr " style="color: #888888; font-size: 12px;">更新时间：<%= format_date(topic.updated_at)%></span>
diff --git a/app/views/issues/_detail.html.erb b/app/views/issues/_detail.html.erb
index ac912a71c..9ae3dfc43 100644
--- a/app/views/issues/_detail.html.erb
+++ b/app/views/issues/_detail.html.erb
@@ -20,7 +20,7 @@
       <span class='<%= "#{get_issue_priority(@issue.priority_id)[0]} " %>'><%= get_issue_priority(@issue.priority_id)[1] %></span></p>
     <br>
     <div class="cl"></div>
-    由<%=link_to @issue.author, user_path(@issue.author), :class => "link-blue" %>添加于 <%= format_time(@issue.created_on).html_safe %>
+    由<%=link_to @issue.author.show_name, user_path(@issue.author), :class => "link-blue" %>添加于 <%= format_time(@issue.created_on).html_safe %>
   </div>
 
   <!--talk_txt end-->
diff --git a/app/views/layouts/base_forums.html.erb b/app/views/layouts/base_forums.html.erb
index 021b281d9..b57feb5bd 100644
--- a/app/views/layouts/base_forums.html.erb
+++ b/app/views/layouts/base_forums.html.erb
@@ -187,7 +187,8 @@
             </div>
             <div class="fl">
               <div class="f16 fontBlue mb10" style="word-break: break-all; word-wrap:break-word;white-space:pre-wrap;"><%= @forum.name%></div>
-              <div class="fontGrey2 mb8">吧主：<a href="<%= user_path(@forum.creator)%>" class="linkBlue"><%= @forum.creator.name%></a></div>
+              <% user_name =  @forum.creator.show_name.empty? ? @forum.creator.name : @forum.creator.show_name %>
+              <div class="fontGrey2 mb8">吧主：<a href="<%= user_path(@forum.creator)%>" class="linkBlue"><%= user_name %></a></div>
               <div class="fontGrey3">回答：<a href="javascript:void(0);" class="linkOrange mr5" style="cursor: default"><%= @forum.memo_count  %></a> 帖子：<a href="javascript:void(0);" class="linkOrange" style="cursor: default"><%=@forum.topic_count%></a></div>
             </div>
             <div class="cl"></div>
diff --git a/app/views/memos/show.html.erb b/app/views/memos/show.html.erb
index 95059e21d..7015d17e5 100644
--- a/app/views/memos/show.html.erb
+++ b/app/views/memos/show.html.erb
@@ -58,7 +58,7 @@
       <div class="cl"></div>
 
       <div class="postDetailCreater">
-        <%= link_to @memo.author.name, user_path(@memo.author), :class => "linkBlue2", :target=> "_blank"%></div>
+        <%= link_to @memo.author.show_name, user_path(@memo.author), :class => "linkBlue2", :target=> "_blank"%></div>
       <div class="postDetailDate mb5"><%= format_date( @memo.created_at)%></div>
       <div class="cl"></div>
       <div class="homepagePostIntro memo-content" id="activity_description_<%= @memo.id %>" style="word-break: break-all; word-wrap:break-word;margin-bottom: 0px !important;" >
diff --git a/app/views/users/_project_issue_detail.html.erb b/app/views/users/_project_issue_detail.html.erb
index 95e297f49..321ba663a 100644
--- a/app/views/users/_project_issue_detail.html.erb
+++ b/app/views/users/_project_issue_detail.html.erb
@@ -62,7 +62,7 @@
     <li>
       <p class="label03">&nbsp;指派&nbsp;&nbsp;:&nbsp;</p>
       <span class="pro_info_p" style="width:130px;">
-        <%= link_to activity.try(:assigned_to), user_path(activity.assigned_to_id), :class => "linkBlue hidden", :style => "max-width:100px; display:inline-block;" %>
+        <%= link_to activity.try(:assigned_to).show_name, user_path(activity.assigned_to_id), :class => "linkBlue hidden", :style => "max-width:100px; display:inline-block;" %>
         <a href="javascript:void(0)" class="pic_edit2 ml5" style="vertical-align:top;"></a></span>
       <%= select( :issue, :user_id, principals_options_for_isuue_list(activity.project),
                { :include_blank => false,:selected => @assign_to_id ? @assign_to_id : 0},
diff --git a/app/views/users/user_organizations.html.erb b/app/views/users/user_organizations.html.erb
index 3dc8332da..86177f2e4 100644
--- a/app/views/users/user_organizations.html.erb
+++ b/app/views/users/user_organizations.html.erb
@@ -25,7 +25,8 @@
                     <%= link_to org.name, organization_path(org), :class => 'f16 linkBlue' %>
                 </div>
                 <div class="orgIntro"><%= org.description %></div>
-                <div class="postCreater">创建者：<%= link_to User.find(org.creator_id), user_path(org.creator_id), :class => 'linkGrey2', :target => '_blank' %></div>
+                <% user_name =  User.find(org.creator_id).show_name.empty? ? User.find(org.creator_id) : User.find(org.creator_id).show_name %>
+                <div class="postCreater">创建者：<%= link_to user_name, user_path(org.creator_id), :class => 'linkGrey2', :target => '_blank' %></div>
                 <div class="postDate fl mr40">创建时间：<%= format_activity_day(org.created_at) %> <%= format_time(org.created_at, false) %></div>
                 <div class="postCreater">您的身份：<%= User.current.admin_of_org?(org) ? "组织管理员" : "组织成员" %></div>
               </div>