pull request权限判断

app/controllers/pull_requests_controller.rb

@@ -14,7 +14,7 @@ class PullRequestsController < ApplicationController
     # project_menu_type 为了控制base顶部导航
     @project_menu_type = 6
     # 不符合pullrequest条件的给出提示
-    @allow_to_pull_request = allow_pull_request(@project) > 0 && allow_show_pull_request(@project) > 0
+    @allow_to_pull_request = allow_pull_request(@project) > 0
 
     type = params[:type]
     case type

app/controllers/repositories_controller.rb

@@ -380,8 +380,7 @@ update
     # 顶部导航
     @project_menu_type = 5
 
-    ## TODO: the below will move to filter, done.
-
+    # TODO: the below will move to filter, done.
     # 获取版本库目录结构
     @entries = @repository.entries(@path, @rev)
     if request.xhr?

app/helpers/application_helper.rb

@@ -902,12 +902,6 @@ module ApplicationHelper
     atts.count > 0 ? true :false
   end
 
-  # 如果Pull Request数量为0就显示在更多中
-  def allow_show_pull_request project
-    g = Gitlab.client
-    count = g.merge_requests(project.gpid).count
-  end
-
   # 必须是项目成员，项目必须提交过代码
   def allow_pull_request project
     return 0 if project.gpid.nil?

app/views/layouts/_base_project_top.html.erb

@@ -47,11 +47,13 @@
           </li>
       <% end %>
       <!--Pull Request-->
+      <% unless @project.gpid.nil? %>
           <li id="project_menu_06">
             <%= link_to project_score.pull_request_num >0 ? "Pull Requests <span class='issues_nav_tag ml5'>#{switch_integer_into_k project_score.pull_request_num}</span>".html_safe : "Pull Requests", project_pull_requests_path(@project), :class => "pro_new_proname", :title => "#{project_score.pull_request_num}"  %>
             <% if project_score.pull_request_num >0 %>
             <% end %>
           </li>
+      <% end %>
       <!--里程碑-->
       <li id="project_menu_07">
         <%= link_to @project.versions.count >0 ? "#{l(:label_roadmap)}<span class='issues_nav_tag ml5'>#{switch_integer_into_k @project.versions.count}</span>".html_safe : l(:label_roadmap) ,project_roadmap_path(@project), :class => "pro_new_proname" %>

app/views/pull_requests/index.html.erb

@@ -41,6 +41,10 @@
         });
     </script>
 <% else %>
-    <p>不符合条件，内容待补充</p>
+    <div class="new_roadmap_conbox mb10" >
+      <div class="new_roadmap_navbox clear">
+        版本库中还没有提交代码，请先提交代码
+      </div>
+    </div>
 <% end %>
 

app/views/pull_requests/new.html.erb

@@ -15,14 +15,5 @@
         $("#changed-files-detail").hide();
     });
 
-    $(".merge-record li a").click(function(){
-        $(".merge-record li a").removeClass("active");
-        $(this).addClass("active");
-
-        var index = $(".merge-record li a").index(this);
-
-        $("#merge_record_0, #merge_record_1").hide();
-        $("#merge_record_" + index).show();
-    });
 </script>