From 69301a11208154fe8d1a54f0dbf7bad580d6ac09 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Thu, 25 Aug 2016 10:04:51 +0800
Subject: [PATCH] =?UTF-8?q?Pull=20reques=E7=99=BB=E5=BD=95=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=EF=BC=88=E6=9D=83=E9=99=90=E6=8E=A7=E5=88=B6=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/pull_requests_controller.rb    |  9 +++++++++
 app/views/projects/_development_group.html.erb | 10 +++++-----
 app/views/pull_requests/_show.html.erb         |  6 ++++--
 app/views/pull_requests/index.html.erb         |  5 +++--
 4 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/app/controllers/pull_requests_controller.rb b/app/controllers/pull_requests_controller.rb
index 5e21f9af0..b67a74439 100644
--- a/app/controllers/pull_requests_controller.rb
+++ b/app/controllers/pull_requests_controller.rb
@@ -1,8 +1,10 @@
 
 class PullRequestsController < ApplicationController
+  before_filter :authorize_logged
   before_filter :find_project_and_repository
   before_filter :connect_gitlab, :only => [:index, :show, :create, :accept_pull_request, :pull_request_commits, :pull_request_changes, :new,
                                               :update_pull_request, :pull_request_comments, :create_pull_request_comment]
+
   layout "base_projects"
   include PullRequestsHelper
   include ApplicationHelper
@@ -235,6 +237,13 @@ class PullRequestsController < ApplicationController
   end
 
   private
+  def authorize_logged
+    if !User.current.logged?
+      redirect_to signin_path
+      return
+    end
+  end
+
   def connect_gitlab
     @g = Gitlab.client
   end
diff --git a/app/views/projects/_development_group.html.erb b/app/views/projects/_development_group.html.erb
index 273fcf56a..82bcb5501 100644
--- a/app/views/projects/_development_group.html.erb
+++ b/app/views/projects/_development_group.html.erb
@@ -40,12 +40,12 @@
 </div>
 <% end %>
 
-<% if allow_pull_request(@project) %>
-    <div class="subNav">
-      <%= link_to "Pull Requests", project_pull_requests_path(@project), :class => "f14 c_blue02" %>
+<div class="subNav">
+  <%= link_to "Pull Requests", project_pull_requests_path(@project), :class => "f14 c_blue02" %>
+  <% if allow_pull_request(@project) %>
       <%= link_to "+新建请求", new_project_pull_request_path(:project_id => @project.id), :class => "subnav_green" %>
-    </div>
-<% end %>
+  <% end %>
+</div>
 
 <%# --版本库被设置成私有、module中设置不显示、没有创建版本库 三种情况不显示-- %>
 <% if visible_repository?(@project) %>
diff --git a/app/views/pull_requests/_show.html.erb b/app/views/pull_requests/_show.html.erb
index b750728a4..758f70878 100644
--- a/app/views/pull_requests/_show.html.erb
+++ b/app/views/pull_requests/_show.html.erb
@@ -5,8 +5,10 @@
 <div id="pull_request_show">
   <div id="mergeShow" class="f14 fontGrey2 merge-show">
     <span class="mr10 open-status"><%= get_state(@request.state) %></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) %> 前
-    <% unless @request.state == "merged" %>
-        <%= link_to "#{@request.state == 'closed' ? '重新打开' : '关闭'}", update_pull_request_project_pull_request_path(@request.id, :project_id => @project.id, :state => @request.state =="closed" ? "reopen" : "close"), :class => "BlueCirBtn fr" %>
+    <% if User.current.login == @request.author.try(:username) || is_project_manager?(User.current.id, @project.id) %>
+        <% unless @request.state == "merged" %>
+            <%= link_to "#{@request.state == 'closed' ? '重新打开' : '关闭'}", update_pull_request_project_pull_request_path(@request.id, :project_id => @project.id, :state => @request.state =="closed" ? "reopen" : "close"), :class => "BlueCirBtn fr" %>
+        <% end %>
     <% end %>
     <div class="cl"></div>
   </div>
diff --git a/app/views/pull_requests/index.html.erb b/app/views/pull_requests/index.html.erb
index 78c4759aa..f4fe0725e 100644
--- a/app/views/pull_requests/index.html.erb
+++ b/app/views/pull_requests/index.html.erb
@@ -3,8 +3,9 @@
   <li class="active"><%= link_to "待处理<span class='project-number-dot'>#{@requests_opened_count}</span>".html_safe, project_pull_requests_path(:type => "1"), :remote => true %></li>
   <li><%= link_to "已处理<span class='project-number-dot'>#{@requests_merged_count}</span>".html_safe, project_pull_requests_path(:type => "2"), :remote => true %></li>
   <li><%= link_to "已关闭<span class='project-number-dot'>#{@requests_closed_count}</span>".html_safe, project_pull_requests_path(:type => "3"), :remote => true %></li>
-
-  <%= link_to "创建Pull Request", new_project_pull_request_path, :class => "BlueCirBtn fr ml10 mt10", :style => "width:110px;" %>
+  <% if allow_pull_request(@project) %>
+      <%= link_to "创建Pull Request", new_project_pull_request_path, :class => "BlueCirBtn fr ml10 mt10", :style => "width:110px;" %>
+  <% end %>
   <div class="cl"></div>
 </ul>
 <div class="cl"></div>