add: setting navbar varible
This commit is contained in:
parent
99fbecc834
commit
882a50cf56
|
@ -1,6 +1,7 @@
|
||||||
class SettingsController < ApplicationController
|
class SettingsController < ApplicationController
|
||||||
def show
|
def show
|
||||||
@old_projects_url = nil
|
@old_projects_url = nil
|
||||||
|
get_navbar
|
||||||
get_add_menu
|
get_add_menu
|
||||||
get_common_menu
|
get_common_menu
|
||||||
get_personal_menu
|
get_personal_menu
|
||||||
|
@ -8,6 +9,17 @@ class SettingsController < ApplicationController
|
||||||
end
|
end
|
||||||
|
|
||||||
private
|
private
|
||||||
|
def get_navbar
|
||||||
|
@navbar = []
|
||||||
|
default_laboratory.navbar.each do |site|
|
||||||
|
hash = {}
|
||||||
|
site.each {|k, v|
|
||||||
|
hash.merge!("#{k}": get_site_url(k, v))
|
||||||
|
}
|
||||||
|
@navbar << hash
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
def get_add_menu
|
def get_add_menu
|
||||||
@add = []
|
@add = []
|
||||||
Site.add.select(:id, :name, :url, :key).to_a.map(&:serializable_hash).each do |site|
|
Site.add.select(:id, :name, :url, :key).to_a.map(&:serializable_hash).each do |site|
|
||||||
|
|
|
@ -18,7 +18,7 @@ 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"] = "https://forgeplus.trustie.net/users/#{current_user.login}/projects"
|
# nav_bar[2]["link"] = "https://forgeplus.trustie.net/users/#{current_user.login}/projects"
|
||||||
|
@ -39,7 +39,7 @@ json.setting do
|
||||||
json.moop_cases_banner_url default_setting.moop_cases_banner_url&.[](1..-1)
|
json.moop_cases_banner_url default_setting.moop_cases_banner_url&.[](1..-1)
|
||||||
json.oj_banner_url default_setting.oj_banner_url&.[](1..-1)
|
json.oj_banner_url default_setting.oj_banner_url&.[](1..-1)
|
||||||
|
|
||||||
json.navbar nav_bar
|
json.navbar @navbar
|
||||||
|
|
||||||
json.footer default_setting.footer
|
json.footer default_setting.footer
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue