From 1ec010038694f521bc4971a2b70ac04082fd7cc3 Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Fri, 11 Nov 2016 17:35:11 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=AE=80=E4=BB=8B?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4=EF=BC=8C=E5=B9=B6=E4=B8=94?=
 =?UTF-8?q?=E8=BE=93=E5=85=A5=E7=BD=91=E9=A1=B5=E8=83=BD=E7=82=B9=E5=87=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/projects/show.html.erb   | 13 +++++++++----
 public/stylesheets/css/project.css |  4 ++--
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/app/views/projects/show.html.erb b/app/views/projects/show.html.erb
index b32ec6a3a..f9a88baf8 100644
--- a/app/views/projects/show.html.erb
+++ b/app/views/projects/show.html.erb
@@ -1,11 +1,13 @@
 <!--新版项目头部结束-->
-<div class="pro_new_info mb10 break_word">
+<div class="pro_new_info mb10 break_word" style="padding-bottom: 5px" >
  <div id="project_invite_code"><%= render :partial => 'projects/invite_code' %></div>
+  <div id="project_description_code" >
   <% if @project.description.blank? %>
-      <p class="break_word"><%= @project.name %></p>
+      <p class="break_word"  style="padding-top:5px"><%= @project.name %></p>
   <% else %>
-      <p class="break_word"><%=h @project.description.html_safe %></p>
+      <p class="break_word" style="padding-top:5px"><%=h @project.description.html_safe %></p>
   <% end %>
+  </div>
 </div>
 
 <input type="hidden" value="<%= @type %>" name="type" id="user_activities_type">
@@ -34,4 +36,7 @@
   </div>
 
   <%= render :partial => "project_activities", :locals => {:forge_acts => @events_pages, :page => 0, :type => @type} %>
-</div>
\ No newline at end of file
+</div>
+<script>
+ autoUrl('project_description_code');
+</script>
\ No newline at end of file
diff --git a/public/stylesheets/css/project.css b/public/stylesheets/css/project.css
index 667c91863..ead88aef7 100644
--- a/public/stylesheets/css/project.css
+++ b/public/stylesheets/css/project.css
@@ -887,7 +887,7 @@ a:hover.btn_newpro_grey,a:active.btn_newpro_grey{ background: #eaeaea;}
 /*项目简介*/
 .pro_new_info{ border:1px solid #ddd; background-color:#fff;  width: 998px;}
 .pro_new_info h2{ background: #fff; font-size: 14px; color: #333; height: 40px; line-height: 40px; padding-left: 15px; border-bottom:1px solid #e5e5e5;}
-.pro_new_info p{ padding-bottom:2px; padding-left: 5px; color: #666; padding-right: 5px}
+.pro_new_info p{ padding-bottom:2px; padding-left: 15px; color: #666; padding-right: 5px}
 .pro_new_info_weight{ font-size: 16px; font-weight: bold;}
 /* 新版项目配置*/
 .pro_new_setting_leftnav{ width: 162px; border:1px solid #ddd; background-color:#fff; padding:3px; padding-bottom: 0;}
@@ -1030,4 +1030,4 @@ textarea.muban_textarea{ width: 98.5%;border:1px solid #ddd; background:#fff; co
 a.pro_new_users { max-width:80px; overflow:hidden;overflow:hidden;text-overflow:ellipsis;white-space:nowrap; word-break:break-all; display: inline-block;  font-weight: bold; color: #666;}
 a:hover.pro_new_users {color: #3b94d6}
 .pro_new_users img{ width:40px;height:40px; border: 3px solid #fff;-webkit-border-radius:50px;-moz-border-radius:50px;-o-border-radius:50px;border-radius:50px;}
-.pro_new_users img:hover{border: 3px solid #e6e6e6;}
+.pro_new_users img:hover{border: 3px solid #e6e6e6;}

From 753da4b078c0299ee6b287c0b47e1a6c24311542 Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Fri, 11 Nov 2016 17:59:34 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E7=82=B9=E5=87=BB=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E5=B0=86id=E6=94=B9=E4=B8=BA=E7=94=A8=E6=88=B7=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/issues/show.html.erb                          | 2 +-
 app/views/projects/settings/_new_versions_form.html.erb | 3 ++-
 app/views/versions/show.html.erb                        | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/views/issues/show.html.erb b/app/views/issues/show.html.erb
index 5df730cdb..29cd93444 100644
--- a/app/views/issues/show.html.erb
+++ b/app/views/issues/show.html.erb
@@ -61,7 +61,7 @@
         <li class="clear">
           <span class="pro_new_conbox_leftspan fl">指派给</span>
           <span class="pro_new_conbox_rightspan fl ml10">
-             <a href="<%=  @issue.assigned_to_id.nil? ? "javascript:void(0)" : user_path(@issue.assigned_to_id)  %>" class="c_blue" ><%= @issue.assigned_to ? @issue.assigned_to.show_name : "--" %></a></span>
+             <a href="<%=  @issue.assigned_to_id.nil? ? "javascript:void(0)" : user_path(@issue.assigned_to)  %>" class="c_blue" ><%= @issue.assigned_to ? @issue.assigned_to.show_name : "--" %></a></span>
         </li>
     <% end %>
     <% unless @issue.disabled_core_fields.include?('fixed_version_id') %>
diff --git a/app/views/projects/settings/_new_versions_form.html.erb b/app/views/projects/settings/_new_versions_form.html.erb
index 5d9243eea..f6dc90d91 100644
--- a/app/views/projects/settings/_new_versions_form.html.erb
+++ b/app/views/projects/settings/_new_versions_form.html.erb
@@ -23,7 +23,8 @@
         </li>
         <div class="cl mb10"></div>
       </ul>
-      <a href="javascript:void(0);" class="fr sy_btn_grey " onclick="pro_st_show_ban1();">取消</a><a href="javascript:void(0);" onclick="project_version_commit();" class="fr sy_btn_blue mr5">保存</a>
+      <a href="javascript:void(0);" class="fr sy_btn_grey " onclick="pro_st_show_ban1();">取消</a>
+      <a href="javascript:void(0);" onclick="project_version_commit();" class="fr sy_btn_blue mr5">保存</a>
     </div>
 <% end %>
 <script>
diff --git a/app/views/versions/show.html.erb b/app/views/versions/show.html.erb
index 20544e957..1da325593 100644
--- a/app/views/versions/show.html.erb
+++ b/app/views/versions/show.html.erb
@@ -70,7 +70,7 @@
               <td>#<%= issue.id %></td>
               <td><a href="<%= issue_path(issue) %>" class="new_roadmap_info_title" title="<%= issue.subject %>" target="_blank"><%= issue.subject %></a> </td>
               <td> <%= issue.tracker %> </td>
-              <td><a href="<%= issue.assigned_to_id.nil? ? "" : user_path(issue.assigned_to_id) %>" class="new_roadmap_info_name" target="_blank">
+              <td><a href="<%= issue.assigned_to_id.nil? ? "" : user_path(issue.assigned_to) %>" class="new_roadmap_info_name" target="_blank">
                 <%= User.find(issue.try(:assigned_to_id)).nil? ? "" : User.find(issue.try(:assigned_to_id)).show_name %></a>
               </td>
               <td><%= format_time issue.updated_on %></td>

From d1f9ce3ab23403448311e9d260b39d52292591e1 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 11 Nov 2016 18:19:03 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E4=B8=AD=E8=B5=84?=
 =?UTF-8?q?=E6=BA=90=E5=BA=93=E5=AF=BC=E5=85=A5=E4=B8=8D=E8=83=BD=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/users_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index b1d458d49..021c0a9b9 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -1203,7 +1203,7 @@ class UsersController < ApplicationController
 
 
   #引入资源列表根据关键词过滤
-  def user_ref_resource_searc
+  def user_ref_resource_search
     @resource_id = params[:mul_id]
     @resource_type = params[:mul_type]
     @order, @b_sort = params[:order] || "created_on", params[:sort] || "asc"