From 3cea3bae55c1ecf05fa622a8e49156a93a6a21b3 Mon Sep 17 00:00:00 2001 From: "sylor_huang@126.com" Date: Fri, 17 Apr 2020 17:32:37 +0800 Subject: [PATCH] =?UTF-8?q?=E6=AD=A3=E5=BC=8F=E7=89=88=E7=9A=84=E7=BD=91?= =?UTF-8?q?=E7=AB=99=E5=AE=9A=E5=88=B6=E9=94=99=E8=AF=AF=E7=9A=84=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/concerns/laboratory_helper.rb | 3 ++- app/services/admins/save_laboratory_setting_service.rb | 6 +++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/app/controllers/concerns/laboratory_helper.rb b/app/controllers/concerns/laboratory_helper.rb index 3c86e1529..25b292013 100644 --- a/app/controllers/concerns/laboratory_helper.rb +++ b/app/controllers/concerns/laboratory_helper.rb @@ -32,12 +32,13 @@ module LaboratoryHelper end def default_course_links + # my_projects: "/users/#{current_user.try(:login)}/projects", { new_syllabuses: "https://www.trustie.net/syllabuses/new", new_course: "https://www.trustie.net/courses/new", edit_account: "https://www.trustie.net/my/account", my_courses: "https://www.trustie.net/users/#{current_user.try(:login)}/user_courselist", - my_projects: "/users/#{current_user.try(:login)}/projects", + my_projects: "https://www.trustie.net/users/#{current_user.try(:login)}/user_projectlist", my_organ: "https://www.trustie.net/users/#{current_user.try(:login)}/user_organizations", default_url: "https://www.trustie.net/", tiding_url: "https://www.trustie.net/users/#{current_user.try(:login)}/user_messages", diff --git a/app/services/admins/save_laboratory_setting_service.rb b/app/services/admins/save_laboratory_setting_service.rb index c29e374bd..553b6a723 100644 --- a/app/services/admins/save_laboratory_setting_service.rb +++ b/app/services/admins/save_laboratory_setting_service.rb @@ -15,7 +15,11 @@ class Admins::SaveLaboratorySettingService < ApplicationService laboratory_setting.footer = strip params[:footer] laboratory.save! - laboratory_setting.save! + Rails.logger.info("####_____name____E####{laboratory_setting.name}") + Rails.logger.info("####_____navbar____E####{laboratory_setting.navbar}") + Rails.logger.info("####_____footer___E####{laboratory_setting.footer}") + + laboratory_setting.save!(:validate =>false) deal_image_file end