From 187a96b251bd5c93e8d58165b3ebed7cff303183 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Tue, 25 Oct 2016 15:34:32 +0800
Subject: [PATCH] =?UTF-8?q?pull=20request=E8=AF=84=E8=AE=BA=E5=B1=80?=
 =?UTF-8?q?=E9=83=A8=E5=88=B7=E6=96=B0=E5=8F=8A=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/pull_requests_controller.rb | 2 +-
 app/views/pull_requests/_show.html.erb      | 3 ---
 app/views/pull_requests/show.html.erb       | 5 +++--
 app/views/pull_requests/show.js.erb         | 3 ++-
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/app/controllers/pull_requests_controller.rb b/app/controllers/pull_requests_controller.rb
index a3320724c..c8ad92f22 100644
--- a/app/controllers/pull_requests_controller.rb
+++ b/app/controllers/pull_requests_controller.rb
@@ -179,7 +179,7 @@ class PullRequestsController < ApplicationController
     begin
       @comments = @g.create_merge_request_comment(@project.gpid, params[:id], content, User.current.gid)
       respond_to do |format|
-        format.html{redirect_to project_pull_request_path(params[:id], :project_id => @project.id)}
+        format.js{redirect_to project_pull_request_path(params[:id], :project_id => @project.id)}
       end
     rescue Exception => e
       @message = e.message
diff --git a/app/views/pull_requests/_show.html.erb b/app/views/pull_requests/_show.html.erb
index 0773435cc..15728046d 100644
--- a/app/views/pull_requests/_show.html.erb
+++ b/app/views/pull_requests/_show.html.erb
@@ -33,15 +33,12 @@
     <ul class="new_roadmap_nav fl"  >
       <li class="new_roadmap_nav_hover" id="new_roadmap_nav_1" onclick="HoverLi(1);">
         <%= link_to "评论<span class='new_roadmap_nav_taghover ml5' id='new_roadmap_num_1'>#{@comments_count}</span>".html_safe, pull_request_comments_project_pull_request_path(@request.id, :project_id => @project.id, :type => "1"), :remote => true, :class => "new_roadmap_type_nomal", :id => "new_roadmap_type_1" %>
-        <!--<a href="javascript:void(0);" id="new_roadmap_type_1"  class="new_roadmap_type_nomal"  >评论<span id="new_roadmap_num_1" class="new_roadmap_nav_taghover ml5">210</span></a>-->
       </li>
       <li id="new_roadmap_nav_2" onclick="HoverLi(2);">
         <%= link_to "提交<span class='new_roadmap_nav_tagnomal ml5' id='new_roadmap_num_2'>#{@commits_count}</span>".html_safe, pull_request_commits_project_pull_request_path(@request.id, :project_id => @project.id, :type => "2"), :remote => true, :class => "new_roadmap_type_nomal", :id => "new_roadmap_type_2" %></li>
-      <!--<a href="javascript:void(0);" id="new_roadmap_type_2" class="new_roadmap_type_nomal" >提交<span id="new_roadmap_num_2" class="new_roadmap_nav_tagnomal ml5">25</span></a>-->
       </li>
       <li id="new_roadmap_nav_3" onclick="HoverLi(3);">
         <%= link_to "改动<span class='new_roadmap_nav_tagnomal ml5' id='new_roadmap_num_3'>#{@changes_count}</span>".html_safe, pull_request_changes_project_pull_request_path(@request.id, :project_id => @project.id, :type => "3"), :remote => true, :class => "new_roadmap_type_nomal", :id => "new_roadmap_type_3" %></li>
-      <!--<a href="javascript:void(0);" id="new_roadmap_type_3" class="new_roadmap_type_nomal" >改动<span id="new_roadmap_num_3" class="new_roadmap_nav_tagnomal ml5">5</span></a>-->
       </li>
     </ul>
 
diff --git a/app/views/pull_requests/show.html.erb b/app/views/pull_requests/show.html.erb
index cf344d32c..632d910a9 100644
--- a/app/views/pull_requests/show.html.erb
+++ b/app/views/pull_requests/show.html.erb
@@ -1,2 +1,3 @@
-<%= render :partial => "pull_requests/pull_request_container" %>
-<%= render :partial => "pull_requests/show" %>
+<div id="pull_request_show">
+  <%= render :partial => "pull_requests/show" %>
+</div>
diff --git a/app/views/pull_requests/show.js.erb b/app/views/pull_requests/show.js.erb
index 0a64c51a8..32d356cd7 100644
--- a/app/views/pull_requests/show.js.erb
+++ b/app/views/pull_requests/show.js.erb
@@ -1,3 +1,4 @@
-<%# 详情页面和新建页面都会跳入，所以用两种局部刷新 %>
+<%# 新建页面局部替换 %>
 $("#pull_request_new_form").html('<%= escape_javascript(render :partial => "pull_requests/show") %>');
+<%# 详情页面局部替换 %>
 $("#pull_request_show").html('<%= escape_javascript(render :partial => "pull_requests/show") %>');
\ No newline at end of file