From 22a8adb64e8d2191893bde1893825d9c9c9192d8 Mon Sep 17 00:00:00 2001 From: huang Date: Wed, 3 Aug 2016 16:02:42 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=BB=9F=E8=AE=A1=E6=95=B0?= =?UTF-8?q?=E7=9B=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/pull_requests_controller.rb | 6 +++++- app/views/pull_requests/_pull_request_changes.html.erb | 6 +++--- app/views/pull_requests/show.html.erb | 4 ++-- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/app/controllers/pull_requests_controller.rb b/app/controllers/pull_requests_controller.rb index 87cd9ac23..2fe1e934c 100644 --- a/app/controllers/pull_requests_controller.rb +++ b/app/controllers/pull_requests_controller.rb @@ -51,6 +51,9 @@ class PullRequestsController < ApplicationController @type = params[:type] @request = @g.merge_request(@project.gpid, params[:id]) @commits = @g.merge_request_commits(@project.gpid, params[:id].to_i) + @commits_count = @commits.count + @changes = @g.merge_request_changes(@project.gpid, params[:id]).try(:changes) + @changes_count = @changes.count end # Accept a merge request. @@ -79,7 +82,8 @@ class PullRequestsController < ApplicationController # 获取某次请求的改动 def pull_request_changes - @changes = @g.merge_request_changes(@project.gpid, params[:id]) + @changes = @g.merge_request_changes(@project.gpid, params[:id]).try(:changes) + @changes_count = @changes.count end private diff --git a/app/views/pull_requests/_pull_request_changes.html.erb b/app/views/pull_requests/_pull_request_changes.html.erb index 66ce993e5..84067ffca 100644 --- a/app/views/pull_requests/_pull_request_changes.html.erb +++ b/app/views/pull_requests/_pull_request_changes.html.erb @@ -1,7 +1,7 @@ -<% if @changes %> - <% @changes.try(:changes).each do |cd| %> +<% unless @changes.blank? %> + <% @changes.each do |cd| %>
- + <%= cd['new_path'] %>
diff --git a/app/views/pull_requests/show.html.erb b/app/views/pull_requests/show.html.erb index fa84102bd..dce6bd029 100644 --- a/app/views/pull_requests/show.html.erb +++ b/app/views/pull_requests/show.html.erb @@ -12,8 +12,8 @@
根据最近提交时间排列