yystopf
/
forgeplus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FIX 处理顶部导航错误的问题

This commit is contained in:
Jasder 2020-08-10 11:23:01 +08:00
parent d4156a5582
commit 89c230c362
3 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/concerns/laboratory_helper.rb
View File

@ -46,4 +46,8 @@ module LaboratoryHelper
register_url: "https://www.trustie.net/login?login=false" register_url: "https://www.trustie.net/login?login=false"
} }
end end
def manager_url
{name: '管理', link: "#{EduSetting.get('host_name')/managements}"}
end
end end

2
app/models/laboratory_setting.rb
View File

@ -72,4 +72,4 @@ class LaboratorySetting < ApplicationRecord
footer: nil footer: nil
} }
end end
end end

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

@ -20,14 +20,16 @@ json.setting do
# end # end
nav_bar = default_setting.navbar nav_bar = default_setting.navbar
if User.current.logged? # if User.current.logged?
nav_bar[2]["link"] = "/users/#{current_user.login}/projects" # nav_bar[2]["link"] = "/users/#{current_user.login}/projects"
nav_bar[2]["hidden"] = false # nav_bar[2]["hidden"] = false
else # else
nav_bar[2]["link"] = "" # nav_bar[2]["link"] = ""
nav_bar[2]["hidden"] = true # nav_bar[2]["hidden"] = true
# end
if current_user && current_user.admin?
nav_bar << manager_url
end 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)
json.login_logo_url default_setting.login_logo_url&.[](1..-1) json.login_logo_url default_setting.login_logo_url&.[](1..-1)