diff --git a/app/controllers/pull_requests_controller.rb b/app/controllers/pull_requests_controller.rb
index 214bfc2dd..efa060434 100644
--- a/app/controllers/pull_requests_controller.rb
+++ b/app/controllers/pull_requests_controller.rb
@@ -47,17 +47,12 @@ class PullRequestsController < ApplicationController
target_branch = params[:target_branch]
begin
request = @g.create_merge_request(@project.gpid, title, :description => description, :source_branch => source_branch, :target_branch => target_branch)
- e.message
respond_to do |format|
- format.html{redirect_to project_pull_requests_path(request.id, :source_branch => source_branch, :target_branch => target_branch)}
+ format.js{redirect_to project_pull_request_path(request.id, :project_id => @project.id)}
end
rescue Exception => e
@message = e.message
- respond_to do |format|
- format.html
- end
end
- @message
end
def show
diff --git a/app/views/pull_requests/_error_message.html.erb b/app/views/pull_requests/_error_message.html.erb
new file mode 100644
index 000000000..6081f07c4
--- /dev/null
+++ b/app/views/pull_requests/_error_message.html.erb
@@ -0,0 +1,5 @@
+<% if @message %>
+
+ <%= @message %>
+
+<% end %>
\ No newline at end of file
diff --git a/app/views/pull_requests/_form.html.erb b/app/views/pull_requests/_form.html.erb
index f2d7c84ff..f6c28488e 100644
--- a/app/views/pull_requests/_form.html.erb
+++ b/app/views/pull_requests/_form.html.erb
@@ -1,4 +1,4 @@
-<%= form_tag(url_for(:controller => 'pull_requests', :action => 'create', :project_id => @project.id), :id => 'pull_request_form', :method => "post") do %>
+<%= form_tag(url_for(:controller => 'pull_requests', :action => 'create', :project_id => @project.id), :id => 'pull_request_form', :method => "post", :remote => true) do %>
标题
@@ -13,7 +13,7 @@
目标分支
- <%= select_tag :branch, options_for_select(@rev), :name => "source_branch", :value => "source_branch", :class => "ml30 fontGrey3 fb fl", :style => "padding:5px 0 5px 5px;" %>
+ <%= select_tag :branch, options_for_select(@rev), :name => "target_branch", :value => "target_branch", :class => "ml30 fontGrey3 fb fl", :style => "padding:5px 0 5px 5px;" %>
修改分支
diff --git a/app/views/pull_requests/_new.html.erb b/app/views/pull_requests/_new.html.erb
index 6ca978ed5..16f299ca5 100644
--- a/app/views/pull_requests/_new.html.erb
+++ b/app/views/pull_requests/_new.html.erb
@@ -1,8 +1,6 @@
-<% if @message %>
-
- <%= @message %>
-
-<% end %>
+
+ <%= render :partial => "pull_requests/error_message" %>
+
新的合并请求
diff --git a/app/views/pull_requests/create.js.erb b/app/views/pull_requests/create.js.erb
new file mode 100644
index 000000000..36c9368af
--- /dev/null
+++ b/app/views/pull_requests/create.js.erb
@@ -0,0 +1 @@
+$("#create_pull_request_error").html('<%= escape_javascript(render :partial => "pull_requests/error_message") %>');
\ No newline at end of file