From 9a2ff48de8c3a3f9f9958489bbe235b1f72319f7 Mon Sep 17 00:00:00 2001 From: Jasder <2053003901@@qq.com> Date: Thu, 13 Feb 2020 17:59:20 +0800 Subject: [PATCH 1/2] FIX 404 page bug --- app/views/users/get_navigation_info.json.jbuilder | 3 --- app/views/users/get_user_info.json.jbuilder | 1 - 2 files changed, 4 deletions(-) diff --git a/app/views/users/get_navigation_info.json.jbuilder b/app/views/users/get_navigation_info.json.jbuilder index 86223cb68..afe0963ca 100644 --- a/app/views/users/get_navigation_info.json.jbuilder +++ b/app/views/users/get_navigation_info.json.jbuilder @@ -40,8 +40,6 @@ json.top do # 旧版的域名 json.old_url @old_domain - # 云上实验室管理权限 - json.laboratory_user current_laboratory&.laboratory_users.exists?(user_id: @user&.id) || @user&.admin_or_business? end json.down do @@ -55,4 +53,3 @@ json.down do end json.online_consult "https://shang.qq.com/wpa/qunwpa?idkey=2f2043d88c1bd61d182b98bf1e061c6185e23055bec832c07d8148fe11c5a6cd" - diff --git a/app/views/users/get_user_info.json.jbuilder b/app/views/users/get_user_info.json.jbuilder index 436e8e29b..94f3f76a9 100644 --- a/app/views/users/get_user_info.json.jbuilder +++ b/app/views/users/get_user_info.json.jbuilder @@ -13,7 +13,6 @@ json.phone @user.phone json.email @user.mail json.profile_completed @user.profile_completed? json.professional_certification @user.professional_certification -json.main_site current_laboratory&.main_site? if @course json.course_identity @course_identity json.course_name @course.name From 6a41049e1de36eda58d728e7eba2285db2ac68fa Mon Sep 17 00:00:00 2001 From: Jasder <2053003901@@qq.com> Date: Thu, 13 Feb 2020 22:48:40 +0800 Subject: [PATCH 2/2] ADD some count --- app/views/repositories/show.json.jbuilder | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/views/repositories/show.json.jbuilder b/app/views/repositories/show.json.jbuilder index 33f23c106..e79002ded 100644 --- a/app/views/repositories/show.json.jbuilder +++ b/app/views/repositories/show.json.jbuilder @@ -1,5 +1,7 @@ json.identifier @repo.identifier json.project_id @project.id +json.issues_count @project.issues_count +json.pull_requests_count @project.pull_requests_count json.project_identifier @project.identifier json.praises_count @repo.project.praises_count json.forked_count @repo.project.forked_count