floraachy
/
gitlink-forgeplus
mirror of https://gitlink.org.cn/Gitlink/forgeplus.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'dev_trustie' into dev_devops

This commit is contained in:
Jasder 2020-10-16 16:48:26 +08:00
parent 1bff81bb66 32bc3fe9f5
commit 232bb054ce
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app/views/settings/show.json.jbuilder
View File

@ -16,17 +16,17 @@ json.setting do
# #
# json.footer setting.footer || default_setting.footer # json.footer setting.footer || default_setting.footer
# #
# json.main_site current_laboratory.main_site?
# end # end
nav_bar = default_setting.navbar nav_bar = default_setting.navbar
if User.current.logged?
nav_bar[2]["link"] = "/users/#{current_user.login}/projects" # if User.current.logged?
nav_bar[2]["hidden"] = false # nav_bar[2]["link"] = "https://forgeplus.trustie.net/users/#{current_user.login}/projects"
else # nav_bar[2]["hidden"] = false
nav_bar[2]["link"] = "" # else
nav_bar[2]["hidden"] = true # nav_bar[2]["link"] = ""
end # nav_bar[2]["hidden"] = true
# end
json.name default_setting.name json.name default_setting.name
json.nav_logo_url default_setting.nav_logo_url&.[](1..-1) 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 json.old_projects_url @old_projects_url
end end