fix: update openning count navbar
This commit is contained in:
		
							parent
							
								
									7fccd2aed2
								
							
						
					
					
						commit
						be63beb78b
					
				| 
						 | 
				
			
			@ -18,7 +18,7 @@ class MembersController < ApplicationController
 | 
			
		|||
    scope = @project.members.includes(:roles, user: :user_extension)
 | 
			
		||||
    search = params[:search].to_s.downcase
 | 
			
		||||
    role = params[:role].to_s
 | 
			
		||||
    scope = scope.joins(:user).like(search)
 | 
			
		||||
    scope = scope.joins(:user).merge(User.like(search))
 | 
			
		||||
    scope = scope.joins(:roles).where("roles.name LIKE ?", "%#{role}%") if role.present?
 | 
			
		||||
 | 
			
		||||
    @total_count = scope.size
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -38,7 +38,8 @@ class PullRequest < ApplicationRecord
 | 
			
		|||
  has_many :project_trends, as: :trend, dependent: :destroy
 | 
			
		||||
  has_many :attachments, as: :container, dependent: :destroy
 | 
			
		||||
 | 
			
		||||
  scope :merged_and_closed, ->{where.not(status: 1)}
 | 
			
		||||
  scope :merged_and_closed, ->{where.not(status: 0)}
 | 
			
		||||
  scope :opening, -> {where(status: 0)}
 | 
			
		||||
 | 
			
		||||
  after_save :reset_cache_data
 | 
			
		||||
  after_destroy :reset_cache_data
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -30,6 +30,7 @@ class Version < ApplicationRecord
 | 
			
		|||
 | 
			
		||||
  scope :version_includes, ->{includes(:issues, :user)}
 | 
			
		||||
  scope :closed, ->{where(status: 'closed')}
 | 
			
		||||
  scope :opening, ->{where(status: 'open')}
 | 
			
		||||
 | 
			
		||||
  # def open_issues_count
 | 
			
		||||
  #   issues.select(:id,:status_id).where(status_id: [1,2,3,4,6]).size
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -12,13 +12,13 @@ json.name @project.name
 | 
			
		|||
json.description  @project.description
 | 
			
		||||
json.project_id @project.id
 | 
			
		||||
json.repo_id @repository.id
 | 
			
		||||
json.issues_count @project.issues_count.to_i - @project.pull_requests_count.to_i
 | 
			
		||||
json.pull_requests_count @project.pull_requests_count 
 | 
			
		||||
json.issues_count @project.issues_count.to_i - @project.pull_requests_count.to_i - @project.issues.issue_issue.closed.size
 | 
			
		||||
json.pull_requests_count @project.pull_requests.opening.size
 | 
			
		||||
json.project_identifier render_identifier(@project)
 | 
			
		||||
json.praises_count @project.praises_count.to_i
 | 
			
		||||
json.forked_count @project.forked_count.to_i
 | 
			
		||||
json.watchers_count @project.watchers_count.to_i
 | 
			
		||||
json.versions_count @project.versions_count  #里程碑数量
 | 
			
		||||
json.versions_count @project.versions.opening.size #里程碑数量
 | 
			
		||||
json.version_releases_count @project.releases_size(@user.try(:id), "all")
 | 
			
		||||
json.version_releasesed_count @project.releases_size(@user.try(:id), "released")  #已发行的版本
 | 
			
		||||
json.permission render_permission(@user, @project)
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue