From 79ed9feaff005ca1f0094d0b122776b0b4ee76c8 Mon Sep 17 00:00:00 2001 From: Karel Picman Date: Tue, 24 Nov 2015 10:51:19 +0100 Subject: [PATCH] Converting Documents to DMSF is not working #471 --- app/controllers/dmsf_upload_controller.rb | 3 ++- app/models/dmsf_upload.rb | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/app/controllers/dmsf_upload_controller.rb b/app/controllers/dmsf_upload_controller.rb index 4063ab55..e5d864cf 100644 --- a/app/controllers/dmsf_upload_controller.rb +++ b/app/controllers/dmsf_upload_controller.rb @@ -39,7 +39,8 @@ class DmsfUploadController < ApplicationController if uploaded_files && uploaded_files.is_a?(Hash) # standard file input uploads uploaded_files.each_value do |uploaded_file| - @uploads.push(DmsfUpload.create_from_uploaded_attachment(@project, @folder, uploaded_file)) + upload = DmsfUpload.create_from_uploaded_attachment(@project, @folder, uploaded_file) + @uploads.push(upload) if upload end else # plupload multi upload completed diff --git a/app/models/dmsf_upload.rb b/app/models/dmsf_upload.rb index 31ae5566..a151de50 100644 --- a/app/models/dmsf_upload.rb +++ b/app/models/dmsf_upload.rb @@ -47,8 +47,11 @@ class DmsfUpload } FileUtils.mv(a.diskfile, "#{DmsfHelper.temp_dir}/#{uploaded[:disk_filename]}") a.destroy - DmsfUpload.new(project, folder, uploaded) + upload = DmsfUpload.new(project, folder, uploaded) + else + Rails.logger.error "An attachment not found by its token: #{uploaded_file[:token]}" end + upload end def initialize(project, folder, uploaded)