From 32bc3fe9f56f9aee82049980aacf994f54352880 Mon Sep 17 00:00:00 2001 From: "sylor_huang@126.com" Date: Fri, 16 Oct 2020 16:43:57 +0800 Subject: [PATCH] FIX merge --- app/views/settings/show.json.jbuilder | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/app/views/settings/show.json.jbuilder b/app/views/settings/show.json.jbuilder index 939153c67..7de12345d 100644 --- a/app/views/settings/show.json.jbuilder +++ b/app/views/settings/show.json.jbuilder @@ -16,17 +16,17 @@ json.setting do # # json.footer setting.footer || default_setting.footer # - # json.main_site current_laboratory.main_site? # end nav_bar = default_setting.navbar - if User.current.logged? - nav_bar[2]["link"] = "/users/#{current_user.login}/projects" - nav_bar[2]["hidden"] = false - else - nav_bar[2]["link"] = "" - nav_bar[2]["hidden"] = true - end + + # if User.current.logged? + # nav_bar[2]["link"] = "https://forgeplus.trustie.net/users/#{current_user.login}/projects" + # nav_bar[2]["hidden"] = false + # else + # nav_bar[2]["link"] = "" + # nav_bar[2]["hidden"] = true + # end json.name default_setting.name json.nav_logo_url default_setting.nav_logo_url&.[](1..-1) @@ -48,4 +48,4 @@ json.setting do json.old_projects_url @old_projects_url -end \ No newline at end of file +end