From 07d272daa4b4953472b1300498f57e20c71e6049 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karel=20Pi=C4=8Dman?= <karel.picman@kontron.com>
Date: Wed, 2 Jan 2019 14:42:47 +0100
Subject: [PATCH] Documents upload if disk is full #937

---
 app/controllers/dmsf_files_controller.rb   | 20 +++++++++++++++-----
 app/models/dmsf_file_revision.rb           |  2 +-
 app/views/settings/_dmsf_settings.html.erb |  2 +-
 3 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/app/controllers/dmsf_files_controller.rb b/app/controllers/dmsf_files_controller.rb
index 050cb7c6..b4785365 100644
--- a/app/controllers/dmsf_files_controller.rb
+++ b/app/controllers/dmsf_files_controller.rb
@@ -139,8 +139,10 @@ class DmsfFilesController < ApplicationController
 
         # Custom fields
         if params[:dmsf_file_revision][:custom_field_values].present?
-          params[:dmsf_file_revision][:custom_field_values].each_with_index do |v, i|
-            revision.custom_field_values[i].value = v[1]
+          i = 0
+          params[:dmsf_file_revision][:custom_field_values].each do |_, v|
+            revision.custom_field_values[i].value = v
+            i = i + 1
           end
         end
 
@@ -149,14 +151,22 @@ class DmsfFilesController < ApplicationController
         if revision.save
           revision.assign_workflow(params[:dmsf_workflow_id])
           if upload
-            FileUtils.mv(upload.tempfile_path, revision.disk_file(false))
+            begin
+              FileUtils.mv(upload.tempfile_path, revision.disk_file(false))
+            rescue StandardError => e
+              Rails.logger.error e.message
+              flash[:error] = e.message
+              revision.destroy
+              redirect_to :back
+              return
+            end
           end
           if @file.locked? && !@file.locks.empty?
             begin
               @file.unlock!
               flash[:notice] = "#{l(:notice_file_unlocked)}, "
             rescue Exception => e
-              logger.error "Cannot unlock the file: #{e.message}"
+              Rails.logger.error "Cannot unlock the file: #{e.message}"
             end
           end
           if @file.save
@@ -172,7 +182,7 @@ class DmsfFilesController < ApplicationController
                 end
               end
             rescue Exception => e
-              logger.error "Could not send email notifications: #{e.message}"
+              Rails.logger.error "Could not send email notifications: #{e.message}"
             end
           else
             flash[:errors] = @file.errors.full_messages.join(', ')
diff --git a/app/models/dmsf_file_revision.rb b/app/models/dmsf_file_revision.rb
index 596d4e7d..a43554ed 100644
--- a/app/models/dmsf_file_revision.rb
+++ b/app/models/dmsf_file_revision.rb
@@ -133,7 +133,7 @@ class DmsfFileRevision < ActiveRecord::Base
     end
     if Setting.plugin_redmine_dmsf['dmsf_really_delete_files']
       dependencies = DmsfFileRevision.where(disk_filename: disk_filename).all.size
-      File.delete(disk_file) if dependencies <= 1 && File.exist?(disk_file)
+      FileUtils.rm_f(disk_file) if dependencies <= 1
     end
     super
   end
diff --git a/app/views/settings/_dmsf_settings.html.erb b/app/views/settings/_dmsf_settings.html.erb
index 887ac689..2e5aaa5c 100644
--- a/app/views/settings/_dmsf_settings.html.erb
+++ b/app/views/settings/_dmsf_settings.html.erb
@@ -83,7 +83,7 @@
   <% rescue %>
     <p class="warning"><%= l(:error_file_can_not_be_created) %></p>
   <%	ensure %>
-    <% FileUtils.rm_rf(testfilename) %>
+    <% FileUtils.rm_f(testfilename) %>
   <% end %>
 <% end %>