From 2c793948a381a66e4a0b2b8e5630fdf8ff28cc0f Mon Sep 17 00:00:00 2001 From: cxt <853663049@qq.com> Date: Mon, 16 Mar 2020 19:17:17 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AF=BE=E5=A0=82=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers/application_helper.rb | 6 +++--- app/views/courses/index.json.jbuilder | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index d1d2499f0..88ed373d9 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -140,11 +140,11 @@ module ApplicationHelper # 用户图像url,如果不存在的话,source为匿名用户,即默认使用匿名用户图像 def url_to_avatar(source) if File.exist?(disk_filename(source&.class, source&.id)) - ctime = File.ctime(disk_filename(source.class, source.id)).to_i + ctime = File.ctime(disk_filename(source&.class, source&.id)).to_i if source.class.to_s == 'User' - File.join(relative_path, ["#{source.class}", "#{source.id}"]) + "?t=#{ctime}" + File.join(relative_path, ["#{source&.class}", "#{source&.id}"]) + "?t=#{ctime}" else - File.join("images/avatars", ["#{source.class}", "#{source.id}"]) + "?t=#{ctime}" + File.join("images/avatars", ["#{source&.class}", "#{source&.id}"]) + "?t=#{ctime}" end elsif source.class.to_s == 'User' str = source.user_extension.try(:gender).to_i == 0 ? "b" : "g" diff --git a/app/views/courses/index.json.jbuilder b/app/views/courses/index.json.jbuilder index 8a0d06475..f9bceebb8 100644 --- a/app/views/courses/index.json.jbuilder +++ b/app/views/courses/index.json.jbuilder @@ -2,7 +2,7 @@ json.courses @courses do |course| json.id course.id json.name course.name json.avatar_url url_to_avatar(course.teacher) - json.creator course.teacher.real_name + json.creator course.teacher&.real_name json.school course.school&.name json.technical_title "" # course.teacher.identity json.course_members_count course.course_members_count