fixed download file
This commit is contained in:
parent
59ceeaeac3
commit
88c18c28d4
|
@ -653,9 +653,9 @@ class AnnouncementsController < ApplicationController
|
||||||
@path = file.file.path rescue ""
|
@path = file.file.path rescue ""
|
||||||
@filename = @path.split("/").last
|
@filename = @path.split("/").last
|
||||||
@ext = @path.split("/").last.to_s.split(".").last
|
@ext = @path.split("/").last.to_s.split(".").last
|
||||||
if @ext == "png" || @ext == "jpg" || @ext == "bmp" || @ext == "pdf"
|
# if @ext == "png" || @ext == "jpg" || @ext == "bmp" || @ext == "pdf"
|
||||||
render "archives/download_file.html",:layout=>false
|
# render "archives/download_file.html",:layout=>false
|
||||||
else
|
# else
|
||||||
if (current_site.accessibility_mode rescue false)
|
if (current_site.accessibility_mode rescue false)
|
||||||
render "archives/redirect_to_file.html",:layout=>false
|
render "archives/redirect_to_file.html",:layout=>false
|
||||||
return
|
return
|
||||||
|
@ -665,7 +665,7 @@ class AnnouncementsController < ApplicationController
|
||||||
send_file(@path, :type=>"application/octet-stream", :filename => @escaped_file_name, :x_sendfile=> true)
|
send_file(@path, :type=>"application/octet-stream", :filename => @escaped_file_name, :x_sendfile=> true)
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
end
|
# end
|
||||||
else
|
else
|
||||||
render :file => "#{Rails.root}/app/views/errors/403.html", :layout => false, :status => :not_found, :content_type => 'text/html'
|
render :file => "#{Rails.root}/app/views/errors/403.html", :layout => false, :status => :not_found, :content_type => 'text/html'
|
||||||
return
|
return
|
||||||
|
|
Loading…
Reference in New Issue