Browse Source

back: change navbar count

tags/v3.1.1
vilet.yy 5 years ago
parent
commit
bdec369ec2
3 changed files with 18 additions and 4 deletions
  1. +14
    -0
      app/models/concerns/dcodes.rb
  2. +1
    -1
      app/models/pull_request.rb
  3. +3
    -3
      app/views/repositories/detail.json.jbuilder

+ 14
- 0
app/models/concerns/dcodes.rb View File

@@ -11,4 +11,18 @@ module Dcodes
code
end

def init_project_invite_code
while Project.where(invite_code: nil).size > 0 do
projects = Project.where(invite_code: nil).limit(1000)
set_sql = ""
projects.each do |p|
set_sql += "WHEN #{p.id} THEN '#{DCODES.sample(6).join}' "
end
sql = "UPDATE projects SET invite_code = CASE id "+ set_sql+ "END WHERE id IN(#{projects.ids.join(",")})"
Project.connection.execute(sql)
end
repeat_codes = Project.group(:invite_code).count.select{|k,v| v>1}
Project.where(invite_code: repeat_code.keys).update_all(invite_code: nil)
end

end

+ 1
- 1
app/models/pull_request.rb View File

@@ -38,7 +38,7 @@ class PullRequest < ApplicationRecord
has_many :project_trends, as: :trend, dependent: :destroy
has_many :attachments, as: :container, dependent: :destroy

scope :closed, ->{where(status: 2)}
scope :merged_and_closed, ->{where.not(status: 1)}

after_save :reset_cache_data
after_destroy :reset_cache_data


+ 3
- 3
app/views/repositories/detail.json.jbuilder View File

@@ -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.issues.closed.size - @project.pull_requests_count.to_i
json.pull_requests_count @project.pull_requests_count - @project.pull_requests.closed.size
json.issues_count @project.issues_count.to_i - @project.pull_requests_count.to_i
json.pull_requests_count @project.pull_requests_count
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 - @project.versions.closed.size #里程碑数量
json.versions_count @project.versions_count #里程碑数量
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…
Cancel
Save