floraachy
/
gitlink-forgeplus
mirror of https://gitlink.org.cn/Gitlink/forgeplus.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

fix: update openning count navbar

This commit is contained in:
vilet.yy 2021-06-16 09:49:08 +08:00
parent 7fccd2aed2
commit be63beb78b
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/members_controller.rb
View File

@ -18,7 +18,7 @@ class MembersController < ApplicationController
scope = @project.members.includes(:roles, user: :user_extension) scope = @project.members.includes(:roles, user: :user_extension)
search = params[:search].to_s.downcase search = params[:search].to_s.downcase
role = params[:role].to_s 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? scope = scope.joins(:roles).where("roles.name LIKE ?", "%#{role}%") if role.present?
@total_count = scope.size @total_count = scope.size

3
app/models/pull_request.rb
View File

@ -38,7 +38,8 @@ class PullRequest < ApplicationRecord
has_many :project_trends, as: :trend, dependent: :destroy has_many :project_trends, as: :trend, dependent: :destroy
has_many :attachments, as: :container, 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_save :reset_cache_data
after_destroy :reset_cache_data after_destroy :reset_cache_data

1
app/models/version.rb
View File

@ -30,6 +30,7 @@ class Version < ApplicationRecord
scope :version_includes, ->{includes(:issues, :user)} scope :version_includes, ->{includes(:issues, :user)}
scope :closed, ->{where(status: 'closed')} scope :closed, ->{where(status: 'closed')}
scope :opening, ->{where(status: 'open')}
# def open_issues_count # def open_issues_count
# issues.select(:id,:status_id).where(status_id: [1,2,3,4,6]).size # issues.select(:id,:status_id).where(status_id: [1,2,3,4,6]).size

6
app/views/repositories/detail.json.jbuilder
View File

@ -12,13 +12,13 @@ json.name @project.name
json.description @project.description json.description @project.description
json.project_id @project.id json.project_id @project.id
json.repo_id @repository.id json.repo_id @repository.id
json.issues_count @project.issues_count.to_i - @project.pull_requests_count.to_i 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_count json.pull_requests_count @project.pull_requests.opening.size
json.project_identifier render_identifier(@project) json.project_identifier render_identifier(@project)
json.praises_count @project.praises_count.to_i json.praises_count @project.praises_count.to_i
json.forked_count @project.forked_count.to_i json.forked_count @project.forked_count.to_i
json.watchers_count @project.watchers_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_releases_count @project.releases_size(@user.try(:id), "all")
json.version_releasesed_count @project.releases_size(@user.try(:id), "released") #已发行的版本 json.version_releasesed_count @project.releases_size(@user.try(:id), "released") #已发行的版本
json.permission render_permission(@user, @project) json.permission render_permission(@user, @project)