Browse Source

Merge branch 'dev_trustie' into dev_devops

tags/v1.0.0
Jasder 6 years ago
parent
commit
3f92d99136
3 changed files with 8 additions and 3 deletions
  1. +1
    -1
      app/controllers/users_controller.rb
  2. +5
    -0
      app/tasks/sync_project_socre_rake.rb
  3. +2
    -2
      app/views/admins/projects/shared/_list.html.erb

+ 1
- 1
app/controllers/users_controller.rb View File

@@ -171,7 +171,7 @@ class UsersController < ApplicationController
end
end
Rails.logger.info("==========projects_json========+########{projects_json}")
render json: { projects: projects_json }
render json: { projects: projects_json.present? ? projects_json : {} }
end
def trustie_projects


+ 5
- 0
app/tasks/sync_project_socre_rake.rb View File

@@ -0,0 +1,5 @@
class SyncProjectScoreRake
# 运行示例: 检查哪些用户的gitea不存在,bundle exec rails runner "SyncProjectScoreRake.new.call()"

end

+ 2
- 2
app/views/admins/projects/shared/_list.html.erb View File

@@ -28,8 +28,8 @@
<td><%= project.is_public ? '√' : '' %></td>
<td><%= project.issues.size %></td>
<td><%= project.attachments.size %></td>
<td><%= project.project_score.try(:changeset_num).to_i %></td>
<td><%= project.project_score.try(:pull_request_num).to_i %></td>
<td><%= project&.project_score.try(:changeset_num).to_i %></td>
<td><%= project&.project_score.try(:pull_request_num).to_i %></td>
<td><%= project.versions.size %></td>
<td><%= project.members.size %></td>
<td>


Loading…
Cancel
Save