mirror of
https://gitlink.org.cn/Gitlink/forgeplus.git
synced 2026-05-24 05:35:46 +08:00
Merge branch 'dev_trustie' into dev_devops
This commit is contained in:
@@ -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)
|
||||||
|
|||||||
Reference in New Issue
Block a user