新增:compare接口新增filescount数据
This commit is contained in:
		
							parent
							
								
									ca3db4c724
								
							
						
					
					
						commit
						a4c2242a8a
					
				| 
						 | 
				
			
			@ -18,6 +18,7 @@ class CompareController < ApplicationController
 | 
			
		|||
    @page_limit = page_limit <=0 ? 15 : page_limit
 | 
			
		||||
    @page_offset = (@page_size -1) * @page_limit
 | 
			
		||||
    Rails.logger.info("+========#{@page_size}-#{@page_limit}-#{@page_offset}")
 | 
			
		||||
    Rails.logger.info @compare_result
 | 
			
		||||
  end
 | 
			
		||||
 | 
			
		||||
  private
 | 
			
		||||
| 
						 | 
				
			
			@ -36,7 +37,7 @@ class CompareController < ApplicationController
 | 
			
		|||
      if @exist_pullrequest.present?
 | 
			
		||||
        return -2, "在这些分支之间的合并请求已存在:<a href='/#{@owner.login}/#{@project.identifier}/pulls/#{@exist_pullrequest.id}'>#{@exist_pullrequest.try(:title)}</a>"
 | 
			
		||||
      else 
 | 
			
		||||
        if @compare_result["Commits"].blank? && @compare_result["Diff"].blank?
 | 
			
		||||
        if @compare_result["FilesCount"].to_i == 0 && @compare_result["CommitsCount"].to_i == 0
 | 
			
		||||
          return -2, "分支内容相同,无需创建合并请求"
 | 
			
		||||
        end
 | 
			
		||||
      end
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,4 +1,5 @@
 | 
			
		|||
json.commits_count @compare_result['CommitsCount']
 | 
			
		||||
json.files_count @compare_result['FilesCount']
 | 
			
		||||
# json.commits @compare_result['Commits'], partial: 'pull_requests/commit', as: :commit
 | 
			
		||||
json.commits do
 | 
			
		||||
  if @compare_result['Commits'].present?
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue