From 3ce088002a191bc7bd4d7c3112b719a0a4ddd030 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Sat, 13 Aug 2016 16:53:56 +0800
Subject: [PATCH] =?UTF-8?q?=E7=95=99=E8=A8=80=E5=92=8C=E5=B7=B2=E5=85=B3?=
 =?UTF-8?q?=E9=97=AD=E6=B5=81=E7=A8=8B=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/pull_requests/_pull_request_comments.html.erb | 2 +-
 app/views/pull_requests/_show.html.erb                  | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/views/pull_requests/_pull_request_comments.html.erb b/app/views/pull_requests/_pull_request_comments.html.erb
index 9208a13ad..dfc1dda05 100644
--- a/app/views/pull_requests/_pull_request_comments.html.erb
+++ b/app/views/pull_requests/_pull_request_comments.html.erb
@@ -2,7 +2,7 @@
   <%= form_tag(url_for(:controller => 'pull_requests', :action => 'create_pull_request_comment', :project_id => @project.id), :id => 'pull_request_comment_form', :method => "post", :remote => true) do %>
       <textarea id="pull_request_comment" name="pull_request_comment"></textarea>
       <span id ="pr_comment_tip" class="fontGrey2 c_red" style="display: none">内容不能为空</span>
-      <a href="javascript:void(0);" class="BlueCirBtn mt10" onclick="pull_request_commit()">提交请求</a>
+      <a href="javascript:void(0);" class="BlueCirBtn mt10" onclick="pull_request_commit()">留言</a>
   <% end %>
 </div>
 <% @comments.each do |comment| %>
diff --git a/app/views/pull_requests/_show.html.erb b/app/views/pull_requests/_show.html.erb
index 3edb9c874..b750728a4 100644
--- a/app/views/pull_requests/_show.html.erb
+++ b/app/views/pull_requests/_show.html.erb
@@ -33,7 +33,11 @@
         <% else %>
             <% if is_project_manager?(User.current.id, @project.id) %>
                 <div class="merge-commit-option mt15">
-                  <%= link_to "接受请求", accept_pull_request_project_pull_request_path(@request.id, :project_id => @project.id), :class => "BlueCirBtn", :remote => true %>
+                  <% if @request.state == "closed"  %>
+                      该请求已被关闭
+                  <% else %>
+                      <%= link_to "接受请求", accept_pull_request_project_pull_request_path(@request.id, :project_id => @project.id), :class => "BlueCirBtn", :remote => true %>
+                  <% end %>
                 </div>
             <% end %>
         <% end %>