From 260e6f8932cfeef3c3a9cdca0d934136a2cc4f22 Mon Sep 17 00:00:00 2001 From: Jasder <2053003901@@qq.com> Date: Fri, 24 Apr 2020 10:15:02 +0800 Subject: [PATCH] =?UTF-8?q?FIX=20=E6=9B=B4=E6=94=B9=E4=BA=91=E4=B8=8A?= =?UTF-8?q?=E5=AE=9E=E9=AA=8C=E5=AE=A4=E4=B8=BB=E7=AB=99=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/laboratory.rb | 4 ++-- .../admins/laboratories/shared/_laboratory_item.html.erb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/models/laboratory.rb b/app/models/laboratory.rb index dab2f6f39..f53a2afee 100644 --- a/app/models/laboratory.rb +++ b/app/models/laboratory.rb @@ -24,7 +24,7 @@ class Laboratory < ApplicationRecord def site rails_env = EduSetting.get('rails_env') - suffix = rails_env && rails_env != 'production' ? ".#{rails_env}.educoder.net" : '.educoder.net' + suffix = rails_env && rails_env != 'production' ? ".#{rails_env}.trustie.net" : '.trustie.net' identifier ? "#{identifier}#{suffix}" : '' end @@ -126,4 +126,4 @@ class Laboratory < ApplicationRecord def main_site? id == 1 end -end \ No newline at end of file +end diff --git a/app/views/admins/laboratories/shared/_laboratory_item.html.erb b/app/views/admins/laboratories/shared/_laboratory_item.html.erb index 1fadd6367..8fdf9c727 100644 --- a/app/views/admins/laboratories/shared/_laboratory_item.html.erb +++ b/app/views/admins/laboratories/shared/_laboratory_item.html.erb @@ -1,6 +1,6 @@ <% school = laboratory&.school %>