Browse Source

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

pull/278/head
Jasder 5 years ago
parent
commit
89c230c362
3 changed files with 14 additions and 8 deletions
  1. +4
    -0
      app/controllers/concerns/laboratory_helper.rb
  2. +1
    -1
      app/models/laboratory_setting.rb
  3. +9
    -7
      app/views/settings/show.json.jbuilder

+ 4
- 0
app/controllers/concerns/laboratory_helper.rb View File

@@ -46,4 +46,8 @@ module LaboratoryHelper
register_url: "https://www.trustie.net/login?login=false"
}
end

def manager_url
{name: '管理', link: "#{EduSetting.get('host_name')/managements}"}
end
end

+ 1
- 1
app/models/laboratory_setting.rb View File

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

+ 9
- 7
app/views/settings/show.json.jbuilder View File

@@ -20,14 +20,16 @@ json.setting do
# 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
# 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 current_user && current_user.admin?
nav_bar << manager_url
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)


Loading…
Cancel
Save