Merge branch 'develop' into standalone_develop
This commit is contained in:
commit
2243697184
|
@ -13,7 +13,7 @@ class SettingsController < ApplicationController
|
||||||
def get_navbar
|
def get_navbar
|
||||||
@navbar = default_laboratory.navbar
|
@navbar = default_laboratory.navbar
|
||||||
if User.current.logged?
|
if User.current.logged?
|
||||||
pernal_index = {"name"=>"个人主页", "link"=>get_site_url("link", "/current_user"), "hidden"=>false}
|
pernal_index = {"name"=>"个人主页", "link"=>get_site_url("url", "/current_user"), "hidden"=>false}
|
||||||
@navbar << pernal_index
|
@navbar << pernal_index
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue