接受PR局部刷新及跳转

app/controllers/pull_requests_controller.rb

@@ -75,10 +75,13 @@ class PullRequestsController < ApplicationController
   # @param  [Integer] id The ID of a merge request.
   # @return [Gitlab::ObjectifiedHash]
   def accept_pull_request
-    commit_id = parmas[:commit_id]
+    begin
-    status = @g.accept_merge_rquest(@project.gpid, commit_id)
+      status = @g.accept_merge_rquest(@project.gpid, params[:id])
-    if status == '200'
+      respond_to do |format|
-      # 需跳入的地方
+        format.js{redirect_to project_pull_request_path(status.id, :project_id => @project.id)}
+      end
+    rescue Exception => e
+      @message = e.message
     end
   end
 

app/views/pull_requests/_show.html.erb

@@ -1,10 +1,15 @@
-<div id="mergeShow" class="f14 fontGrey2 merge-show">
+<div id="create_pull_request_error">
+  <%= render :partial => "pull_requests/error_message" %>
+</div>
+
+<div id="pull_request_show">
+  <div id="mergeShow" class="f14 fontGrey2 merge-show">
     <span class="mr10 open-status"><%= @request.state == "merged" ? "已合并" : "待处理" %></span><span class="mr10">合并请求</span>   由<%= link_to @request.author.try(:username), user_path(get_user_by_login_and(@request.author.try(:username))), :class => "link-blue" %>于<%= time_tag(@request.created_at) %>提交 · 最后编辑时间<%= time_tag(@request.updated_at) %>
     <!--<a href="javascript:void(0);" class="BlueCirBtnMini fr mt5">编辑</a>-->
     <div class="cl"></div>
-</div>
+  </div>
-<div class="new-merge-row b_grey"><strong><%= @request.title %></strong><p class="mt10"><%= @request.description %></p></div>
+  <div class="new-merge-row b_grey"><strong><%= @request.title %></strong><p class="mt10"><%= @request.description %></p></div>
-<% if @commits_count == 0 && @changes_count == 0 %>
+  <% if @commits_count == 0 && @changes_count == 0 %>
       <div class="mt10 mb15">
         请求将 <span class="fontGrey3 fb"><%= @request.source_branch %></span> 合并至 <span class="fontGrey3 fb"><%= @request.target_branch %></span>
         <div class="merge-commit-option mt15">
@@ -12,7 +17,7 @@
           <p class="fontGrey2 mt5">请将新改动提交至源分支或者切换到其它目标分支</p>
         </div>
       </div>
-<% else %>
+  <% else %>
       <% if @request.state == "merged" %>
 
 
@@ -21,7 +26,7 @@
           <div class="mt10 mb15">
             请求将 <span class="fontGrey3 fb"><%= @request.source_branch %></span> 合并至 <span class="fontGrey3 fb"><%= @request.target_branch %></span>
             <div class="merge-commit-option mt15">
-            <%= link_to "接受请求", accept_pull_request_project_pull_request_path(@request.id, :project_id => @project.id), :class => "BlueCirBtn" %>
+              <%= link_to "接受请求", accept_pull_request_project_pull_request_path(@request.id, :project_id => @project.id), :remote => true, :class => "BlueCirBtn" %>
             </div>
           </div>
       <% end %>
@@ -36,10 +41,12 @@
       <div id="merge_record_1" class="undis">
         <%= render :partial => "pull_requests/pull_request_changes" %>
       </div>
-<% end %>
+  <% end %>
+</div>
+
 
 <script>
-    $("#mergeShow").parent().css("width","730px");
+    $("#pull_request_show").parent().css("width","730px");
 
     $("#changed-files").toggle(function(){
         $("#changed-files-detail").show();

app/views/pull_requests/accept_pull_request.js.erb

@@ -0,0 +1,2 @@
+$("#create_pull_request_error").html('<%= escape_javascript(render :partial => "pull_requests/error_message") %>');
+

app/views/pull_requests/show.js.erb

@@ -1 +1,3 @@
+<%# 详情页面和新建页面都会跳入，所以用两种局部刷新 %>
 $("#pull_request_new_form").html('<%= escape_javascript(render :partial => "pull_requests/show") %>');
+$("#pull_request_show").html('<%= escape_javascript(render :partial => "pull_requests/show") %>');

config/routes.rb

@@ -809,7 +809,7 @@ RedmineApp::Application.routes.draw do
       collection do
       end
       member do
-        post 'accept_pull_request'
+        get 'accept_pull_request'
         get 'pull_request_commits'
         get 'pull_request_changes'
       end