#738 Upload failure
This commit is contained in:
parent
3d9384f812
commit
c6bc22404f
@ -133,7 +133,7 @@ class DmsfFilesController < ApplicationController
|
||||
revision.size = upload.size
|
||||
revision.disk_filename = revision.new_storage_filename
|
||||
revision.mime_type = upload.mime_type
|
||||
revision.digest = DmsfFileRevision.create_digest upload.disk_file
|
||||
revision.digest = DmsfFileRevision.create_digest upload.tempfile_path
|
||||
end
|
||||
end
|
||||
|
||||
@ -149,7 +149,7 @@ class DmsfFilesController < ApplicationController
|
||||
if revision.save
|
||||
revision.assign_workflow(params[:dmsf_workflow_id])
|
||||
if upload
|
||||
FileUtils.mv(upload.disk_file, revision.disk_file)
|
||||
FileUtils.mv(upload.tempfile_path, revision.disk_file)
|
||||
end
|
||||
if @file.locked? && !@file.locks.empty?
|
||||
begin
|
||||
|
||||
@ -62,13 +62,17 @@ class DmsfUploadController < ApplicationController
|
||||
|
||||
# async single file upload handling
|
||||
def upload_file
|
||||
@tempfile = params[:file]
|
||||
unless @tempfile.original_filename
|
||||
render_404
|
||||
return
|
||||
begin
|
||||
@tempfile = params[:file]
|
||||
unless @tempfile.original_filename
|
||||
render_404
|
||||
return
|
||||
end
|
||||
@disk_filename = DmsfHelper.temp_filename(@tempfile.original_filename)
|
||||
render :layout => false
|
||||
ensure
|
||||
@tempfile.close false
|
||||
end
|
||||
@disk_filename = DmsfHelper.temp_filename(@tempfile.original_filename)
|
||||
render :layout => false
|
||||
end
|
||||
|
||||
# REST API document upload
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user