From bb071b8e5e2c913fd3c2f30b7293ad1ea1a5ef33 Mon Sep 17 00:00:00 2001 From: Tim Date: Tue, 25 Oct 2016 17:46:33 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?= =?UTF-8?q?=E5=B8=A6=E5=8A=A8=E9=A1=B5=E9=9D=A2=E5=AE=BD=E5=BA=A6=E6=89=A9?= =?UTF-8?q?=E5=B1=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/repositories/commit_diff.html.erb | 110 ++++++++++---------- public/stylesheets/css/project.css | 4 +- 2 files changed, 56 insertions(+), 58 deletions(-) diff --git a/app/views/repositories/commit_diff.html.erb b/app/views/repositories/commit_diff.html.erb index 9a6000c35..915a5a818 100644 --- a/app/views/repositories/commit_diff.html.erb +++ b/app/views/repositories/commit_diff.html.erb @@ -1,59 +1,57 @@ -
-

<%= render :partial => 'breadcrumbs', :locals => {:path => @path, :kind => 'dir', :revision => @rev} %>

-
- - - - - - - -
Commit - <%= @commit_details.id %>
-
  • - <%= render :partial => 'commit_details', :locals => {:changeset => @commit_details} %> -
    • -
    -
    <%= @commit_details.message %>
    - +
    +
    +

    <%= render :partial => 'breadcrumbs', :locals => {:path => @path, :kind => 'dir', :revision => @rev} %>

    +
    + + + + + + + +
    Commit + <%= @commit_details.id %>
    +
  • + <%= render :partial => 'commit_details', :locals => {:changeset => @commit_details} %> +
    • +
    +
    <%= @commit_details.message %>
    + - - - + + + - + -<% @commit_diff.each do |cd| %> -
    - - <%= cd.new_path %> - -
    -
    - - - <% line_num = diff_line_num(cd.diff) %> - <% diff_content = diff_content(cd.diff) %> - <% syntax_highlight_lines(cd.new_path, Redmine::CodesetUtil.to_utf8_by_setting(diff_content)).each do |line| %> - - - <% if line[0,1] == "-" %> - - <% elsif line[0,1] == "+" %> - - <% else%> - - <% end %> - - <% line_num += 1 %> - <% end %> - -
    - <%= line_num %> - 
    <%= line.html_safe %>
    <%= line.html_safe %>
    <%= line.html_safe %>
    -
    -<% end %> - - \ No newline at end of file + <% @commit_diff.each do |cd| %> +
    + + <%= cd.new_path %> + +
    +
    + + + <% line_num = diff_line_num(cd.diff) %> + <% diff_content = diff_content(cd.diff) %> + <% syntax_highlight_lines(cd.new_path, Redmine::CodesetUtil.to_utf8_by_setting(diff_content)).each do |line| %> + + + <% if line[0,1] == "-" %> + + <% elsif line[0,1] == "+" %> + + <% else%> + + <% end %> + + <% line_num += 1 %> + <% end %> + +
    + <%= line_num %> + 
    <%= line.html_safe %>
    <%= line.html_safe %>
    <%= line.html_safe %>
    +
    + <% end %> +
    diff --git a/public/stylesheets/css/project.css b/public/stylesheets/css/project.css index 922ac4e8c..4c7ed2910 100644 --- a/public/stylesheets/css/project.css +++ b/public/stylesheets/css/project.css @@ -400,8 +400,8 @@ tr.open span.expander {background-image: url(/images/bullet_toggle_minus.png);} /*版本库diff*/ .showing-changes-info {width:710px; padding:10px; padding-top: 0px; background-color:#ffffff; line-height:2;} -.showing-changes-project {width:710px; padding:10px; border-top:1px solid #dce0e6; border-bottom:1px solid #dce0e6; background-color:#f1f1f1;} -.showing-changes-row {width:710px; padding:10px; border-bottom:1px solid #dce0e6; background-color:#f1f1f1;} +.showing-changes-project {padding:10px; border-top:1px solid #dce0e6; border-bottom:1px solid #dce0e6; background-color:#f1f1f1;} +.showing-changes-row {padding:10px; border-bottom:1px solid #dce0e6; background-color:#f1f1f1;} #changed-files-detail {display:none;} #changed-files-detail li {list-style-type:disc; margin-left:15px;} .showing-changes-detail {width:670px; border-bottom:1px solid #dce0e6; background-color:#f1f1f1;} From 5eb82de6e0a0a2daa1eec72d3dee86b3250951dd Mon Sep 17 00:00:00 2001 From: huang Date: Wed, 26 Oct 2016 13:45:15 +0800 Subject: [PATCH 2/2] =?UTF-8?q?pull=20request=E6=9D=83=E9=99=90=E5=88=A4?= =?UTF-8?q?=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/pull_requests_controller.rb | 2 +- app/controllers/repositories_controller.rb | 3 +-- app/helpers/application_helper.rb | 6 ------ app/views/layouts/_base_project_top.html.erb | 12 +++++++----- app/views/pull_requests/index.html.erb | 6 +++++- app/views/pull_requests/new.html.erb | 9 --------- 6 files changed, 14 insertions(+), 24 deletions(-) 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(); - });