From 24d73f4eb6c3c399ba5abda73d040a7b8301b0c8 Mon Sep 17 00:00:00 2001 From: "sylor_huang@126.com" Date: Wed, 22 Jul 2020 17:21:59 +0800 Subject: [PATCH 1/3] Fix admin project list --- app/tasks/sync_project_socre_rake.rb | 5 +++++ app/views/admins/projects/shared/_list.html.erb | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 app/tasks/sync_project_socre_rake.rb diff --git a/app/tasks/sync_project_socre_rake.rb b/app/tasks/sync_project_socre_rake.rb new file mode 100644 index 000000000..c8a7348f7 --- /dev/null +++ b/app/tasks/sync_project_socre_rake.rb @@ -0,0 +1,5 @@ +class SyncProjectScoreRake + # 运行示例: 检查哪些用户的gitea不存在，bundle exec rails runner "SyncProjectScoreRake.new.call()" + + +end \ No newline at end of file diff --git a/app/views/admins/projects/shared/_list.html.erb b/app/views/admins/projects/shared/_list.html.erb index d092134ca..47e5a64eb 100644 --- a/app/views/admins/projects/shared/_list.html.erb +++ b/app/views/admins/projects/shared/_list.html.erb @@ -28,8 +28,8 @@ <%= project.is_public ? '√' : '' %> <%= project.issues.size %> <%= project.attachments.size %> - <%= project.project_score.try(:changeset_num).to_i %> - <%= project.project_score.try(:pull_request_num).to_i %> + <%= project&.project_score.try(:changeset_num).to_i %> + <%= project*.project_score.try(:pull_request_num).to_i %> <%= project.versions.size %> <%= project.members.size %> From 5465d61d5069f48df31004092ead0a31ee05c73d Mon Sep 17 00:00:00 2001 From: "sylor_huang@126.com" Date: Wed, 22 Jul 2020 17:22:23 +0800 Subject: [PATCH 2/3] Fix bugs --- app/views/admins/projects/shared/_list.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/admins/projects/shared/_list.html.erb b/app/views/admins/projects/shared/_list.html.erb index 47e5a64eb..bd6300283 100644 --- a/app/views/admins/projects/shared/_list.html.erb +++ b/app/views/admins/projects/shared/_list.html.erb @@ -29,7 +29,7 @@ <%= project.issues.size %> <%= project.attachments.size %> <%= project&.project_score.try(:changeset_num).to_i %> - <%= project*.project_score.try(:pull_request_num).to_i %> + <%= project&.project_score.try(:pull_request_num).to_i %> <%= project.versions.size %> <%= project.members.size %> From 8ce7d8c9217c1f94b011bad4bc02cb915a87fd8a Mon Sep 17 00:00:00 2001 From: "sylor_huang@126.com" Date: Wed, 22 Jul 2020 20:20:42 +0800 Subject: [PATCH 3/3] Fix bugs --- app/controllers/users_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 3c1fa0989..ac60f4d18 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -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