From 5c916bc4e8eebe30c04b5af321a4d84ea282bc19 Mon Sep 17 00:00:00 2001 From: xxq250 Date: Fri, 9 May 2025 09:38:57 +0800 Subject: [PATCH] =?UTF-8?q?fixed=20settings=20=E5=8E=BB=E6=8E=89=E5=A4=9A?= =?UTF-8?q?=E4=BD=99=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/concerns/laboratory_helper.rb | 12 +--- app/controllers/settings_controller.rb | 3 +- app/views/settings/show.json.jbuilder | 55 +++++-------------- 3 files changed, 15 insertions(+), 55 deletions(-) diff --git a/app/controllers/concerns/laboratory_helper.rb b/app/controllers/concerns/laboratory_helper.rb index ea6e00558..4744929e0 100644 --- a/app/controllers/concerns/laboratory_helper.rb +++ b/app/controllers/concerns/laboratory_helper.rb @@ -32,18 +32,8 @@ module LaboratoryHelper end def default_course_links - # my_projects: "/users/#{current_user.try(:login)}/projects", - # my_projects: "https://www.trustie.net/users/#{current_user.try(:login)}/user_projectlist", { - 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_organ: "https://www.trustie.net/users/#{current_user.try(:login)}/user_organizations", - default_url: Rails.application.config_for(:configuration)['platform_url'], - tiding_url: "https://www.trustie.net/users/#{current_user.try(:login)}/user_messages", - register_url: "https://www.trustie.net/login?login=false" + default_url: Rails.application.config_for(:configuration)['platform_url'] } end end diff --git a/app/controllers/settings_controller.rb b/app/controllers/settings_controller.rb index c95ad0bcd..1facea1c4 100644 --- a/app/controllers/settings_controller.rb +++ b/app/controllers/settings_controller.rb @@ -1,13 +1,12 @@ class SettingsController < ApplicationController def show - @old_projects_url = nil get_navbar site_page_deploy_domain get_add_menu get_common_menu get_sub_competitions get_personal_menu - get_third_party + # get_third_party get_third_party_new get_top_system_notification end diff --git a/app/views/settings/show.json.jbuilder b/app/views/settings/show.json.jbuilder index 2b622f678..0aa0d4326 100644 --- a/app/views/settings/show.json.jbuilder +++ b/app/views/settings/show.json.jbuilder @@ -1,33 +1,4 @@ json.setting do - # 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.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.footer setting.footer || default_setting.footer - # - # end - - # nav_bar = default_setting.navbar - - # if User.current.logged? - # nav_bar[2]["link"] = "https://forgeplus.trustie.net/users/#{current_user.login}/projects" - # nav_bar[2]["hidden"] = false - # else - # nav_bar[2]["link"] = "" - # nav_bar[2]["hidden"] = true - # end - json.name default_setting.name json.nav_logo_url default_setting.nav_logo_url&.[](1..-1) json.login_logo_url default_setting.login_logo_url&.[](1..-1) @@ -35,18 +6,18 @@ json.setting do json.site_page_deploy_domain @deploy_domain json.subject_banner_url default_setting.subject_banner_url&.[](1..-1) - json.course_banner_url default_setting.course_banner_url&.[](1..-1) + # json.course_banner_url default_setting.course_banner_url&.[](1..-1) json.competition_banner_url EduSetting.get("competition_banner_url").to_s json.competition_banner_href EduSetting.get("competition_banner_href").to_s - 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.moop_cases_banner_url default_setting.moop_cases_banner_url&.[](1..-1) + # json.oj_banner_url default_setting.oj_banner_url&.[](1..-1) json.navbar @navbar json.footer default_setting.footer json.main_site current_laboratory.main_site? - json.new_course default_course_links + # json.new_course default_course_links json.is_local EduSetting.get("is_local") == "true" json.add do @@ -62,15 +33,15 @@ json.setting do end json.common @common - json.third_party @third_party + # json.third_party @third_party json.third_party_new @third_party_new - if @top_system_notification.present? - json.system_notification do - json.(@top_system_notification, :id, :subject, :sub_subject, :content) - json.is_read @top_system_notification.read_member?(current_user&.id) - end - else - json.system_notification nil - end + # if @top_system_notification.present? + # json.system_notification do + # json.(@top_system_notification, :id, :subject, :sub_subject, :content) + # json.is_read @top_system_notification.read_member?(current_user&.id) + # end + # else + # json.system_notification nil + # end end