diff --git a/app/controllers/concerns/commentable_actions.rb b/app/controllers/concerns/commentable_actions.rb index e1e153495..e4f8f952e 100644 --- a/app/controllers/concerns/commentable_actions.rb +++ b/app/controllers/concerns/commentable_actions.rb @@ -115,8 +115,8 @@ module CommentableActions def recover_documents_from_cache(resource) return false unless resource.try(:documents) resource.documents = resource.documents.each do |document| - if document.cached_attachment.present? && File.exists?(document.cached_attachment) - document.attachment = File.open(document.cached_attachment) + if document.cached_attachment.present? + document.attachment = URI.parse(document.cached_attachment) end end end diff --git a/app/controllers/documents_controller.rb b/app/controllers/documents_controller.rb index d246add70..200d3d142 100644 --- a/app/controllers/documents_controller.rb +++ b/app/controllers/documents_controller.rb @@ -45,7 +45,7 @@ class DocumentsController < ApplicationController end def destroy_upload - @document = Document.new(attachment: File.open(params[:path])) + @document = Document.new(attachment: URI.parse(params[:path])) @document.documentable = @documentable if @document.attachment.destroy @@ -62,7 +62,7 @@ class DocumentsController < ApplicationController if @document.valid? @document.attachment_file_name = "#{Time.now.to_i} - #{@document.attachment_file_name}" @document.attachment.save - @document.cached_attachment = @document.attachment.path + @document.cached_attachment = URI(request.url) + @document.attachment.url else @document.attachment.destroy end @@ -91,7 +91,7 @@ class DocumentsController < ApplicationController def recover_attachments_from_cache if @document.attachment.blank? && @document.cached_attachment.present? - @document.attachment = File.open(@document.cached_attachment) + @document.attachment = URI.parse(@document.cached_attachment) end end