handle attahcment with send_file
This commit is contained in:
parent
ab0cfc0036
commit
a699ebdbcc
5 changed files with 19 additions and 2 deletions
8
app/controllers/files_controller.rb
Normal file
8
app/controllers/files_controller.rb
Normal file
|
@ -0,0 +1,8 @@
|
||||||
|
class FilesController < ApplicationController
|
||||||
|
def download
|
||||||
|
uploader = Note.find(params[:id]).attachment
|
||||||
|
uploader.retrieve_from_store!(params[:filename])
|
||||||
|
send_file uploader.file.path, disposition: 'attachment'
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
|
@ -19,4 +19,8 @@ class AttachmentUploader < CarrierWave::Uploader::Base
|
||||||
rescue
|
rescue
|
||||||
false
|
false
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def secure_url
|
||||||
|
"/files/#{model.class.to_s.underscore}/#{model.id}/#{file.filename}"
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -26,7 +26,7 @@
|
||||||
= markdown truncate(event.target.note, length: 70)
|
= markdown truncate(event.target.note, length: 70)
|
||||||
- note = event.target
|
- note = event.target
|
||||||
- if note.attachment.url
|
- if note.attachment.url
|
||||||
= link_to note.attachment.url, target: "_blank", class: 'note-file-attach' do
|
= link_to note.attachment.secure_url, target: "_blank", class: 'note-file-attach' do
|
||||||
- if note.attachment.image?
|
- if note.attachment.image?
|
||||||
= image_tag note.attachment.url, class: 'note-image-attach'
|
= image_tag note.attachment.url, class: 'note-image-attach'
|
||||||
- else
|
- else
|
||||||
|
|
|
@ -31,7 +31,7 @@
|
||||||
- if note.attachment.image?
|
- if note.attachment.image?
|
||||||
= image_tag note.attachment.url, class: 'note-image-attach'
|
= image_tag note.attachment.url, class: 'note-image-attach'
|
||||||
.attachment.pull-right
|
.attachment.pull-right
|
||||||
= link_to note.attachment.url, target: "_blank" do
|
= link_to note.attachment.secure_url, target: "_blank" do
|
||||||
%i.icon-paper-clip
|
%i.icon-paper-clip
|
||||||
= note.attachment_identifier
|
= note.attachment_identifier
|
||||||
.clear
|
.clear
|
||||||
|
|
|
@ -45,6 +45,11 @@ Gitlab::Application.routes.draw do
|
||||||
root to: "projects#index"
|
root to: "projects#index"
|
||||||
end
|
end
|
||||||
|
|
||||||
|
#
|
||||||
|
# Attachments serving
|
||||||
|
#
|
||||||
|
get 'files/:type/:id/:filename' => 'files#download', constraints: { id: /\d+/, type: /[a-z]+/, filename: /[a-zA-Z.0-9_\-\+]+/ }
|
||||||
|
|
||||||
#
|
#
|
||||||
# Admin Area
|
# Admin Area
|
||||||
#
|
#
|
||||||
|
|
Loading…
Reference in a new issue