Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIX: use `short_path` of flair upload to get signed url for secure media. 

If we use `upload.url` for secure urls then the images won't render.
This commit is contained in:
Vinoth Kannan 2020-06-05 07:43:15 +05:30
parent 2de2537595
commit 0f20a6f0aa
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/group.rb
View File

@ -750,7 +750,7 @@ class Group < ActiveRecord::Base
end end
def flair_url def flair_url
flair_icon.presence || flair_upload&.url flair_icon.presence || flair_upload&.short_path
end end
protected protected

4
spec/jobs/migrate_group_flair_images_spec.rb
View File

@ -28,7 +28,9 @@ RSpec.describe Jobs::MigrateGroupFlairImages do
end.to change { Upload.count }.by(1) end.to change { Upload.count }.by(1)
group.reload group.reload
expect(group.flair_upload).to eq(Upload.last) upload = Upload.last
expect(group.flair_upload).to eq(upload)
expect(group.flair_url).to eq(upload.short_path)
expect(group[:flair_url]).to eq(nil) expect(group[:flair_url]).to eq(nil)
end end