From 88875ed4731e76ac9a14fed538dc5f56a325f020 Mon Sep 17 00:00:00 2001 From: "sylor_huang@126.com" Date: Thu, 16 Jul 2020 11:01:59 +0800 Subject: [PATCH 1/3] change --- app/models/laboratory_setting.rb | 3 ++- app/views/settings/show.json.jbuilder | 8 +++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/app/models/laboratory_setting.rb b/app/models/laboratory_setting.rb index fbf44e4cc..5b406f444 100644 --- a/app/models/laboratory_setting.rb +++ b/app/models/laboratory_setting.rb @@ -63,10 +63,11 @@ class LaboratorySetting < ApplicationRecord navbar: [ { 'name' => '首页', 'link' => '/projects', 'hidden' => false }, { 'name' => '课程', 'link' => '/courses', 'hidden' => false }, - { 'name' => '项目', 'link' => '/projects', 'hidden' => false }, + { 'name' => '项目', 'link' => '', 'hidden' => true }, { 'name' => '数据', 'link' => '/datas', 'hidden' => false }, { 'name' => '竞赛', 'link' => '/competitions', 'hidden' => false }, { 'name' => '问吧', 'link' => '/forums', 'hidden' => false }, + { 'name' => '开源社区', 'link' => '/projects', 'hidden' => false }, ], footer: nil } diff --git a/app/views/settings/show.json.jbuilder b/app/views/settings/show.json.jbuilder index eac6b8ebd..e9ffba5e9 100644 --- a/app/views/settings/show.json.jbuilder +++ b/app/views/settings/show.json.jbuilder @@ -19,6 +19,12 @@ json.setting do # json.main_site current_laboratory.main_site? # end + nav_bar = default_setting.navbar + if current_user.present? + nav_bar[2]["link"] = "/users/#{current_user.login}" + nav_bar[2]["hidden"] = false + end + json.name default_setting.name json.nav_logo_url default_setting.nav_logo_url&.[](1..-1) json.login_logo_url default_setting.login_logo_url&.[](1..-1) @@ -30,7 +36,7 @@ json.setting do json.moop_cases_banner_url default_setting.moop_cases_banner_url&.[](1..-1) json.oj_banner_url default_setting.oj_banner_url&.[](1..-1) - json.navbar default_setting.navbar + json.navbar nav_bar json.footer default_setting.footer From ea702e8e502dc3326ea8d04c126c58ca9b27bacb Mon Sep 17 00:00:00 2001 From: "sylor_huang@126.com" Date: Thu, 16 Jul 2020 11:57:12 +0800 Subject: [PATCH 2/3] change --- app/views/settings/show.json.jbuilder | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/views/settings/show.json.jbuilder b/app/views/settings/show.json.jbuilder index e9ffba5e9..38d770840 100644 --- a/app/views/settings/show.json.jbuilder +++ b/app/views/settings/show.json.jbuilder @@ -20,9 +20,12 @@ json.setting do # end nav_bar = default_setting.navbar - if current_user.present? + if User.current.logged? nav_bar[2]["link"] = "/users/#{current_user.login}" nav_bar[2]["hidden"] = false + else + nav_bar[2]["link"] = "" + nav_bar[2]["hidden"] = true end json.name default_setting.name From 68dc4b6acde137fabb5dfe40359163d7e39cfd6f Mon Sep 17 00:00:00 2001 From: "sylor_huang@126.com" Date: Thu, 16 Jul 2020 12:00:50 +0800 Subject: [PATCH 3/3] add ignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 164dc6496..836852ea0 100644 --- a/.gitignore +++ b/.gitignore @@ -66,6 +66,7 @@ vendor/bundle/ /Users /files /public/images/avatars +/public/cache_repository /public/files /workspace /log