diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index d670e9a0d..a54d345fa 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -148,9 +148,9 @@ module ApplicationHelper if File.exist?(disk_filename(source&.class, source&.id)) ctime = File.ctime(disk_filename(source.class, source.id)).to_i if %w(User Organization).include?(source.class.to_s) - File.join("images", relative_path, ["#{source.class}", "#{source.id}"]) + "?t=#{ctime}" + File.join("images", 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' source.get_letter_avatar_url diff --git a/app/views/api/v1/issues/_detail.json.jbuilder b/app/views/api/v1/issues/_detail.json.jbuilder index 8b5ff5949..941245b8c 100644 --- a/app/views/api/v1/issues/_detail.json.jbuilder +++ b/app/views/api/v1/issues/_detail.json.jbuilder @@ -27,18 +27,10 @@ json.milestone do end end json.author do - if issue.user.present? - json.partial! "api/v1/users/simple_user", locals: {user: issue.user} - else - json.nil! - end + json.partial! "api/v1/users/simple_user", locals: {user: issue.user} end json.changer do - if issue.changer.present? - json.partial! "api/v1/users/simple_user", locals: {user: issue.changer} - else - json.nil! - end + json.partial! "api/v1/users/simple_user", locals: {user: issue.changer} end json.assigners issue.show_assigners.each do |assigner| json.partial! "api/v1/users/simple_user", locals: {user: assigner} diff --git a/app/views/api/v1/users/_simple_user.json.jbuilder b/app/views/api/v1/users/_simple_user.json.jbuilder index 5e8e970e7..f79729046 100644 --- a/app/views/api/v1/users/_simple_user.json.jbuilder +++ b/app/views/api/v1/users/_simple_user.json.jbuilder @@ -4,6 +4,7 @@ if user.present? json.name user.real_name json.login user.login json.image_url Rails.application.config_for(:configuration)['platform_url'] + "/" + url_to_avatar(user).to_s -else - json.nil! +else + json.name "已注销" + json.login "" end \ No newline at end of file