diff --git a/app/controllers/pull_requests_controller.rb b/app/controllers/pull_requests_controller.rb index c8ad92f22..b9fd8b84a 100644 --- a/app/controllers/pull_requests_controller.rb +++ b/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 diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb index 73be64f0b..3a0f161ed 100644 --- a/app/controllers/repositories_controller.rb +++ b/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? diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index bfeda25e4..e34519ace 100644 --- a/app/helpers/application_helper.rb +++ b/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? diff --git a/app/views/layouts/_base_project_top.html.erb b/app/views/layouts/_base_project_top.html.erb index e5a5480f1..18943e844 100644 --- a/app/views/layouts/_base_project_top.html.erb +++ b/app/views/layouts/_base_project_top.html.erb @@ -47,11 +47,13 @@ <% end %> -
  • - <%= link_to project_score.pull_request_num >0 ? "Pull Requests #{switch_integer_into_k project_score.pull_request_num}".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 %> -
  • + <% unless @project.gpid.nil? %> +
  • + <%= link_to project_score.pull_request_num >0 ? "Pull Requests #{switch_integer_into_k project_score.pull_request_num}".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 %> +
  • + <% end %>
  • <%= link_to @project.versions.count >0 ? "#{l(:label_roadmap)}#{switch_integer_into_k @project.versions.count}".html_safe : l(:label_roadmap) ,project_roadmap_path(@project), :class => "pro_new_proname" %> diff --git a/app/views/pull_requests/index.html.erb b/app/views/pull_requests/index.html.erb index 2a257cb63..6f0061577 100644 --- a/app/views/pull_requests/index.html.erb +++ b/app/views/pull_requests/index.html.erb @@ -41,6 +41,10 @@ }); <% else %> -

    不符合条件,内容待补充

    +
    +
    + 版本库中还没有提交代码,请先提交代码 +
    +
    <% end %> diff --git a/app/views/pull_requests/new.html.erb b/app/views/pull_requests/new.html.erb index 765a20585..2a6af5514 100644 --- a/app/views/pull_requests/new.html.erb +++ b/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(); - });