From 53ac9122b0a450b67770b1eb721de15f36f4842a Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Thu, 5 Dec 2019 11:49:15 +0800
Subject: [PATCH] =?UTF-8?q?banner=E5=9B=BE=E7=9A=84url=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/controllers/admins/laboratory_settings_controller.rb | 2 +-
app/services/admins/save_laboratory_setting_service.rb | 1 -
app/views/settings/show.json.jbuilder | 1 +
3 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/app/controllers/admins/laboratory_settings_controller.rb b/app/controllers/admins/laboratory_settings_controller.rb
index a65b13f59..283afc175 100644
--- a/app/controllers/admins/laboratory_settings_controller.rb
+++ b/app/controllers/admins/laboratory_settings_controller.rb
@@ -16,7 +16,7 @@ class Admins::LaboratorySettingsController < Admins::BaseController
def form_params
params.permit(:identifier, :name,
- :nav_logo, :login_logo, :tab_logo,
+ :nav_logo, :login_logo, :tab_logo, :oj_banner,
:subject_banner, :course_banner, :competition_banner, :moop_cases_banner,
:footer, navbar: %i[name link hidden])
end
diff --git a/app/services/admins/save_laboratory_setting_service.rb b/app/services/admins/save_laboratory_setting_service.rb
index 51f1af20a..c29e374bd 100644
--- a/app/services/admins/save_laboratory_setting_service.rb
+++ b/app/services/admins/save_laboratory_setting_service.rb
@@ -43,7 +43,6 @@ class Admins::SaveLaboratorySettingService < ApplicationService
save_image_file(params[:course_banner], '_course_banner')
save_image_file(params[:competition_banner], '_competition_banner')
save_image_file(params[:moop_cases_banner], '_moop_cases_banner')
- Rails.logger.info("#######params: #{params[:oj_banner]}")
save_image_file(params[:oj_banner], '_oj_banner')
end
diff --git a/app/views/settings/show.json.jbuilder b/app/views/settings/show.json.jbuilder
index e21e9fa48..ede9a2ed8 100644
--- a/app/views/settings/show.json.jbuilder
+++ b/app/views/settings/show.json.jbuilder
@@ -10,6 +10,7 @@ json.setting do
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