Merge branch 'master' into devel-1.6.1

2018-02-14 12:25:54 +01:00 · 2018-02-14 12:25:54 +01:00 · bcb8d8618c
commit bcb8d8618c
parent 7dfc11363d d92f8745ee
1 changed files with 1 additions and 0 deletions
--- a/app/controllers/dmsf_upload_controller.rb
+++ b/app/controllers/dmsf_upload_controller.rb
@ -122,6 +122,7 @@ class DmsfUploadController < ApplicationController
        if upload
          uploaded_file[:disk_filename] = upload.disk_filename
          uploaded_file[:tempfile_path] = upload.tempfile_path
+          uploaded_file[:size] = upload.size
        end
      end
      commit_files_internal uploaded_files