Merge branch 'develop' into standalone_develop

This commit is contained in:
yystopf 2022-03-31 16:18:25 +08:00
commit c5dd099169
1 changed files with 4 additions and 7 deletions

View File

@ -11,13 +11,10 @@ class SettingsController < ApplicationController
private private
def get_navbar def get_navbar
@navbar = [] @navbar = default_laboratory.navbar
default_laboratory.navbar.each do |site| if User.current.logged?
hash = {} pernal_index = {"name"=>"个人主页", "link"=>get_site_url("link", "/current_user"), "hidden"=>false}
site.each {|k, v| @navbar << pernal_index
hash.merge!("#{k}": get_site_url(k, v))
}
@navbar << hash
end end
end end