kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

simplify uploader versions check

This commit is contained in:
Alexis Reigel 2018-04-13 21:29:01 +02:00 committed by Alexis Reigel
parent 96d0b1c67b
commit b606636eab
No known key found for this signature in database
GPG Key ID: C728AF10972E97C0
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/controllers/concerns/uploads_actions.rb
View File

@ -31,17 +31,12 @@ module UploadsActions
disposition = uploader.image_or_video? ? 'inline' : 'attachment'
if uploader.filename == params[:filename]
return send_upload(uploader, attachment: uploader.filename, disposition: disposition)
end
uploaders = [uploader, *uploader.versions.values]
uploader = uploaders.find { |version| version.filename == params[:filename] }
uploader_version = uploader.versions.values.find { |version| version.filename == params[:filename] }
return render_404 unless uploader
if uploader_version
return send_upload(uploader_version, attachment: uploader_version.filename, disposition: disposition)
end
render_404
send_upload(uploader, attachment: uploader.filename, disposition: disposition)
end
private