From fab25436a0e112ff75bf395f48f65d7eb3e854be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=91=B1=E5=91=B1=E5=91=B1?= Date: Tue, 26 Sep 2023 10:03:01 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E8=B0=83=E6=95=B4glcc=20=E7=99=BD=E5=90=8D?= =?UTF-8?q?=E5=8D=95=E5=A4=84=E7=90=86=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/glcc_medium_term_examine_material.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/glcc_medium_term_examine_material.rb b/app/models/glcc_medium_term_examine_material.rb index ffb776591..2c93784ce 100644 --- a/app/models/glcc_medium_term_examine_material.rb +++ b/app/models/glcc_medium_term_examine_material.rb @@ -43,7 +43,7 @@ class GlccMediumTermExamineMaterial < ActiveRecord::Base unless pr.present? state << 3 end - if white_list && term == 1 #特殊处理 白名单的中期考核不处理 中期考核后去掉 + if white_list #特殊处理 白名单考核不处理 state = [] end state From 0e7ccdf58f21cfd3398957c17da093d4e6154aa5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=91=B1=E5=91=B1=E5=91=B1?= Date: Tue, 26 Sep 2023 14:42:58 +0800 Subject: [PATCH 2/3] setting add site_page_deploy_domain --- app/controllers/settings_controller.rb | 5 +++++ app/views/settings/show.json.jbuilder | 1 + 2 files changed, 6 insertions(+) diff --git a/app/controllers/settings_controller.rb b/app/controllers/settings_controller.rb index 90ed5bc37..92a4afd21 100644 --- a/app/controllers/settings_controller.rb +++ b/app/controllers/settings_controller.rb @@ -2,6 +2,7 @@ class SettingsController < ApplicationController def show @old_projects_url = nil get_navbar + site_page_deploy_domain get_add_menu get_common_menu get_sub_competitions @@ -34,6 +35,10 @@ class SettingsController < ApplicationController # end end + def site_page_deploy_domain + @deploy_domain = EduSetting.find_by_name("site_page_deploy_domain").try(:value) + end + def get_add_menu @add = [] Site.add.select(:id, :name, :url, :key).to_a.map(&:serializable_hash).each do |site| diff --git a/app/views/settings/show.json.jbuilder b/app/views/settings/show.json.jbuilder index be79dc594..1027be670 100644 --- a/app/views/settings/show.json.jbuilder +++ b/app/views/settings/show.json.jbuilder @@ -32,6 +32,7 @@ json.setting do json.nav_logo_url default_setting.nav_logo_url&.[](1..-1) json.login_logo_url default_setting.login_logo_url&.[](1..-1) json.tab_logo_url default_setting.tab_logo_url&.[](1..-1) + 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) From 412ac22998f73744789a07fdb64599cf5c766169 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=91=B1=E5=91=B1=E5=91=B1?= Date: Tue, 26 Sep 2023 14:46:50 +0800 Subject: [PATCH 3/3] check_pr_url add trustie --- app/models/glcc_medium_term_examine_material.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/glcc_medium_term_examine_material.rb b/app/models/glcc_medium_term_examine_material.rb index 2c93784ce..b5f6e441e 100644 --- a/app/models/glcc_medium_term_examine_material.rb +++ b/app/models/glcc_medium_term_examine_material.rb @@ -24,7 +24,7 @@ class GlccMediumTermExamineMaterial < ActiveRecord::Base state = [] # code_or_pr_url = "https://www.gitlink.org.cn/Gitlink/forgeplus/pulls/337" url_array = code_or_pr_url.split("/") - gitlink_index = url_array.index("www.gitlink.org.cn") || url_array.index("gitlink.org.cn") + gitlink_index = url_array.index("www.gitlink.org.cn") || url_array.index("gitlink.org.cn") || url_array.index("testforgeplus.trustie.net") pull_index = url_array.index("pulls") #发送没有在gitlink上提交PR的邮件