redmine_plugins/redmine_dmsf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

#738 Upload failure

Browse Source
This commit is contained in:
Karel Picman 2017-06-27 14:43:05 +02:00
parent 3d9384f812
commit c6bc22404f
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/dmsf_files_controller.rb
View File

@ -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

4
app/controllers/dmsf_upload_controller.rb
View File

@ -62,6 +62,7 @@ class DmsfUploadController < ApplicationController
# async single file upload handling
def upload_file
begin
@tempfile = params[:file]
unless @tempfile.original_filename
render_404
@ -69,6 +70,9 @@ class DmsfUploadController < ApplicationController
end
@disk_filename = DmsfHelper.temp_filename(@tempfile.original_filename)
render :layout => false
ensure
@tempfile.close false
end
end
# REST API document upload