github-mirror/discourse
github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-04-08 23:22:24 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

fix the build

Browse Source
This commit is contained in:
Régis Hanol 2015-05-20 15:32:31 +02:00
parent b44488b618
commit 7d3b7a5657
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/uploads_controller.rb
View File

@ -29,7 +29,7 @@ class UploadsController < ApplicationController
return render_404 unless Discourse.store.internal? return render_404 unless Discourse.store.internal?
return render_404 if SiteSetting.prevent_anons_from_downloading_files && current_user.nil? return render_404 if SiteSetting.prevent_anons_from_downloading_files && current_user.nil?
if upload = Upload.find_by(sha1: params[:sha]) || Upload.find_by(id: params[:id], url: request.fullpath) if upload = Upload.find_by(sha1: params[:sha]) || Upload.find_by(id: params[:id], url: request.env["PATH_INFO"])
opts = { filename: upload.original_filename } opts = { filename: upload.original_filename }
opts[:disposition] = 'inline' if params[:inline] opts[:disposition] = 'inline' if params[:inline]
send_file(Discourse.store.path_for(upload), opts) send_file(Discourse.store.path_for(upload), opts)

2
spec/controllers/uploads_controller_spec.rb
View File

@ -133,7 +133,7 @@ describe UploadsController do
end end
it "returns 404 when the upload doens't exist" do it "returns 404 when the upload doens't exist" do
Upload.expects(:find_by).with(sha1: sha).returns(nil) Upload.stubs(:find_by).returns(nil)
get :show, site: site, sha: sha, extension: "pdf" get :show, site: site, sha: sha, extension: "pdf"
expect(response.response_code).to eq(404) expect(response.response_code).to eq(404)