From b606636eab1d9beb0331703dfca7399bba111f46 Mon Sep 17 00:00:00 2001 From: Alexis Reigel Date: Fri, 13 Apr 2018 21:29:01 +0200 Subject: [PATCH] simplify uploader versions check --- app/controllers/concerns/uploads_actions.rb | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/app/controllers/concerns/uploads_actions.rb b/app/controllers/concerns/uploads_actions.rb index 98a55a6d82c..170bca8b56f 100644 --- a/app/controllers/concerns/uploads_actions.rb +++ b/app/controllers/concerns/uploads_actions.rb @@ -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