From d66c0c2f31b717ed3fed6bcff74318a682768635 Mon Sep 17 00:00:00 2001 From: "sylor_huang@126.com" Date: Thu, 13 Feb 2020 17:14:59 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9settings/show.json?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/settings/show.json.jbuilder | 29 +++++++++++++++------------ 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/app/views/settings/show.json.jbuilder b/app/views/settings/show.json.jbuilder index ede9a2ed8..e53aa0d1e 100644 --- a/app/views/settings/show.json.jbuilder +++ b/app/views/settings/show.json.jbuilder @@ -1,20 +1,23 @@ json.setting do - setting = @laboratory.laboratory_setting + if @laboratory.present? + setting = @laboratory.laboratory_setting + json.name setting.name || default_setting.name + json.nav_logo_url (setting.nav_logo_url || default_setting.nav_logo_url)&.[](1..-1) + json.login_logo_url (setting.login_logo_url || default_setting.login_logo_url)&.[](1..-1) + json.tab_logo_url (setting.tab_logo_url || default_setting.tab_logo_url)&.[](1..-1) - json.name setting.name || default_setting.name - json.nav_logo_url (setting.nav_logo_url || default_setting.nav_logo_url)&.[](1..-1) - json.login_logo_url (setting.login_logo_url || default_setting.login_logo_url)&.[](1..-1) - json.tab_logo_url (setting.tab_logo_url || default_setting.tab_logo_url)&.[](1..-1) + json.subject_banner_url (setting.subject_banner_url || default_setting.subject_banner_url)&.[](1..-1) + json.course_banner_url (setting.course_banner_url || default_setting.course_banner_url)&.[](1..-1) + json.competition_banner_url (setting.competition_banner_url || default_setting.competition_banner_url)&.[](1..-1) + json.moop_cases_banner_url (setting.moop_cases_banner_url || default_setting.moop_cases_banner_url)&.[](1..-1) + json.oj_banner_url (setting.oj_banner_url || default_setting.oj_banner_url)&.[](1..-1) - json.subject_banner_url (setting.subject_banner_url || default_setting.subject_banner_url)&.[](1..-1) - json.course_banner_url (setting.course_banner_url || default_setting.course_banner_url)&.[](1..-1) - json.competition_banner_url (setting.competition_banner_url || default_setting.competition_banner_url)&.[](1..-1) - json.moop_cases_banner_url (setting.moop_cases_banner_url || default_setting.moop_cases_banner_url)&.[](1..-1) - json.oj_banner_url (setting.oj_banner_url || default_setting.oj_banner_url)&.[](1..-1) + json.navbar setting.navbar || default_setting.navbar - json.navbar setting.navbar || default_setting.navbar + json.footer setting.footer || default_setting.footer + + json.main_site current_laboratory.main_site? + end - json.footer setting.footer || default_setting.footer - json.main_site current_laboratory.main_site? end \ No newline at end of file