From d5348ed3379a7087a4bf3317e2cee31090d24273 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karel=20Pi=C4=8Dman?= <karel.picman@kontron.com>
Date: Mon, 12 Nov 2018 09:45:21 +0100
Subject: [PATCH] Storage path in EasyRedmine

---
 app/models/dmsf_file_revision.rb                     | 2 +-
 test/functional/dmsf_files_controller_test.rb        | 2 +-
 test/functional/dmsf_files_copy_controller_test.rb   | 2 +-
 test/functional/dmsf_folders_copy_controller_test.rb | 2 +-
 test/functional/dmsf_public_urls_controller_test.rb  | 2 +-
 test/functional/issues_controller_test.rb            | 2 +-
 test/integration/rest_api/dmsf_folder_api_test.rb    | 2 +-
 test/integration/webdav/dmsf_webdav_delete_test.rb   | 2 +-
 test/integration/webdav/dmsf_webdav_get_test.rb      | 4 ++--
 test/integration/webdav/dmsf_webdav_head_test.rb     | 2 +-
 test/integration/webdav/dmsf_webdav_mkcol_test.rb    | 2 +-
 test/integration/webdav/dmsf_webdav_move_test.rb     | 2 +-
 test/integration/webdav/dmsf_webdav_put_test.rb      | 2 +-
 test/unit/dmsf_file_revision_test.rb                 | 2 +-
 14 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/app/models/dmsf_file_revision.rb b/app/models/dmsf_file_revision.rb
index b991b2e7..596d4e7d 100644
--- a/app/models/dmsf_file_revision.rb
+++ b/app/models/dmsf_file_revision.rb
@@ -177,7 +177,7 @@ class DmsfFileRevision < ActiveRecord::Base
     if search_if_not_exists
       unless File.exist?(filename)
         # Let's search for the physical file in source revisions
-        dmsf_file.dmsf_file_revisions.where(['id < ?', id]).order(created_at: :desc).each do |rev|
+        dmsf_file.dmsf_file_revisions.where(['created_at < ?', created_at]).order(created_at: :desc).each do |rev|
           filename = rev.disk_file
           break if File.exist?(filename)
         end
diff --git a/test/functional/dmsf_files_controller_test.rb b/test/functional/dmsf_files_controller_test.rb
index 1847f645..b6ed1bf4 100644
--- a/test/functional/dmsf_files_controller_test.rb
+++ b/test/functional/dmsf_files_controller_test.rb
@@ -35,7 +35,7 @@ class DmsfFilesControllerTest < RedmineDmsf::Test::TestCase
     @request.session[:user_id] = 2
     @dmsf_storage_directory = Setting.plugin_redmine_dmsf['dmsf_storage_directory']
     Setting.plugin_redmine_dmsf['dmsf_storage_directory'] = File.expand_path('../../fixtures/dmsf', __FILE__)
-    FileUtils.cp_r(File.expand_path('../../fixtures/files', __FILE__), Setting.plugin_redmine_dmsf['dmsf_storage_directory'])
+    FileUtils.cp_r File.expand_path('../../fixtures/files', __FILE__), DmsfFile.storage_path
   end
 
   def teardown
diff --git a/test/functional/dmsf_files_copy_controller_test.rb b/test/functional/dmsf_files_copy_controller_test.rb
index 88c7aabe..be613ae8 100644
--- a/test/functional/dmsf_files_copy_controller_test.rb
+++ b/test/functional/dmsf_files_copy_controller_test.rb
@@ -42,7 +42,7 @@ class DmsfFilesCopyControllerTest < RedmineDmsf::Test::TestCase
     @request.session[:user_id] = 2  # John Smith - manager
     @dmsf_storage_directory = Setting.plugin_redmine_dmsf['dmsf_storage_directory']
     Setting.plugin_redmine_dmsf['dmsf_storage_directory'] = File.expand_path('../../fixtures/dmsf', __FILE__)
-    FileUtils.cp_r(File.expand_path('../../fixtures/files', __FILE__), Setting.plugin_redmine_dmsf['dmsf_storage_directory'])
+    FileUtils.cp_r File.expand_path('../../fixtures/files', __FILE__), DmsfFile.storage_path
     @project1.enable_module!(:dmsf)
     @role_manager.add_permission! :file_manipulation
     @role_manager.add_permission! :view_dmsf_folders
diff --git a/test/functional/dmsf_folders_copy_controller_test.rb b/test/functional/dmsf_folders_copy_controller_test.rb
index ccdd09a4..294cd8d0 100644
--- a/test/functional/dmsf_folders_copy_controller_test.rb
+++ b/test/functional/dmsf_folders_copy_controller_test.rb
@@ -42,7 +42,7 @@ class DmsfFoldersCopyControllerTest < RedmineDmsf::Test::TestCase
     @request.session[:user_id] = @user_member.id  # John Smith - manager
     @dmsf_storage_directory = Setting.plugin_redmine_dmsf['dmsf_storage_directory']
     Setting.plugin_redmine_dmsf['dmsf_storage_directory'] = File.expand_path('../../fixtures/dmsf', __FILE__)
-    FileUtils.cp_r(File.expand_path('../../fixtures/files', __FILE__), Setting.plugin_redmine_dmsf['dmsf_storage_directory'])
+    FileUtils.cp_r File.expand_path('../../fixtures/files', __FILE__), DmsfFile.storage_path
     @project1.enable_module!(:dmsf)
     @role_manager.add_permission! :folder_manipulation
     @role_manager.add_permission! :view_dmsf_folders
diff --git a/test/functional/dmsf_public_urls_controller_test.rb b/test/functional/dmsf_public_urls_controller_test.rb
index 07338d28..a7908216 100644
--- a/test/functional/dmsf_public_urls_controller_test.rb
+++ b/test/functional/dmsf_public_urls_controller_test.rb
@@ -27,7 +27,7 @@ class DmsfPublicUrlsControllerTest < RedmineDmsf::Test::TestCase
   def setup
     @dmsf_storage_directory = Setting.plugin_redmine_dmsf['dmsf_storage_directory']
     Setting.plugin_redmine_dmsf['dmsf_storage_directory'] = File.expand_path('../../fixtures/dmsf', __FILE__)
-    FileUtils.cp_r(File.expand_path('../../fixtures/files', __FILE__), Setting.plugin_redmine_dmsf['dmsf_storage_directory'])
+    FileUtils.cp_r File.expand_path('../../fixtures/files', __FILE__), DmsfFile.storage_path
   end
 
   def teardown
diff --git a/test/functional/issues_controller_test.rb b/test/functional/issues_controller_test.rb
index 9333fba3..c60e8cbb 100644
--- a/test/functional/issues_controller_test.rb
+++ b/test/functional/issues_controller_test.rb
@@ -37,7 +37,7 @@ class IssuesControllerTest < RedmineDmsf::Test::TestCase
     @issue1 = Issue.find 1
     @dmsf_storage_directory = Setting.plugin_redmine_dmsf['dmsf_storage_directory']
     Setting.plugin_redmine_dmsf['dmsf_storage_directory'] = File.expand_path('../../fixtures/dmsf', __FILE__)
-    FileUtils.cp_r(File.expand_path('../../fixtures/files', __FILE__), Setting.plugin_redmine_dmsf['dmsf_storage_directory'])
+    FileUtils.cp_r File.expand_path('../../fixtures/files', __FILE__), DmsfFile.storage_path
     User.current = nil
     @request.session[:user_id] = @user_manager.id
   end
diff --git a/test/integration/rest_api/dmsf_folder_api_test.rb b/test/integration/rest_api/dmsf_folder_api_test.rb
index d59b0655..72896c26 100644
--- a/test/integration/rest_api/dmsf_folder_api_test.rb
+++ b/test/integration/rest_api/dmsf_folder_api_test.rb
@@ -29,7 +29,7 @@ class DmsfFolderApiTest < RedmineDmsf::Test::IntegrationTest
   def setup
     @dmsf_storage_directory = Setting.plugin_redmine_dmsf['dmsf_storage_directory']
     Setting.plugin_redmine_dmsf['dmsf_storage_directory'] = File.expand_path('../../../fixtures/dmsf', __FILE__)
-    FileUtils.cp_r(File.expand_path('../../../fixtures/files', __FILE__), Setting.plugin_redmine_dmsf['dmsf_storage_directory'])
+    FileUtils.cp_r File.expand_path('../../../fixtures/files', __FILE__), DmsfFile.storage_path
     @admin = User.find 1
     @jsmith = User.find 2
     @file1 = DmsfFile.find 1
diff --git a/test/integration/webdav/dmsf_webdav_delete_test.rb b/test/integration/webdav/dmsf_webdav_delete_test.rb
index 4763835b..0b931c56 100644
--- a/test/integration/webdav/dmsf_webdav_delete_test.rb
+++ b/test/integration/webdav/dmsf_webdav_delete_test.rb
@@ -45,7 +45,7 @@ class DmsfWebdavDeleteTest < RedmineDmsf::Test::IntegrationTest
     Setting.plugin_redmine_dmsf['dmsf_webdav_use_project_names'] = false
     @dmsf_storage_directory = Setting.plugin_redmine_dmsf['dmsf_storage_directory']
     Setting.plugin_redmine_dmsf['dmsf_storage_directory'] = File.expand_path('../../../fixtures/dmsf', __FILE__)
-    FileUtils.cp_r(File.expand_path('../../../fixtures/files', __FILE__), Setting.plugin_redmine_dmsf['dmsf_storage_directory'])
+    FileUtils.cp_r File.expand_path('../../../fixtures/files', __FILE__), DmsfFile.storage_path
     @project1.enable_module! :dmsf # Flag module enabled
     User.current = nil    
   end
diff --git a/test/integration/webdav/dmsf_webdav_get_test.rb b/test/integration/webdav/dmsf_webdav_get_test.rb
index c2578b50..6d258669 100644
--- a/test/integration/webdav/dmsf_webdav_get_test.rb
+++ b/test/integration/webdav/dmsf_webdav_get_test.rb
@@ -40,7 +40,7 @@ class DmsfWebdavGetTest < RedmineDmsf::Test::IntegrationTest
     Setting.plugin_redmine_dmsf['dmsf_webdav_use_project_names'] = false
     @dmsf_storage_directory = Setting.plugin_redmine_dmsf['dmsf_storage_directory']
     Setting.plugin_redmine_dmsf['dmsf_storage_directory'] = File.expand_path('../../../fixtures/dmsf', __FILE__)
-    FileUtils.cp_r(File.expand_path('../../../fixtures/files', __FILE__), Setting.plugin_redmine_dmsf['dmsf_storage_directory'])
+    FileUtils.cp_r File.expand_path('../../../fixtures/files', __FILE__), DmsfFile.storage_path
     User.current = nil
   end
 
@@ -138,7 +138,7 @@ class DmsfWebdavGetTest < RedmineDmsf::Test::IntegrationTest
 
   def test_user_assigned_to_project_folder_forbidden
     @project2.enable_module! :dmsf # Flag module enabled
-    get "/dmsf/webdav/#{@project1.identifier}", nil, @jsmith
+    get "/dmsf/webdav/#{@project2.identifier}", nil, @jsmith
     assert_response :not_found
   end
 
diff --git a/test/integration/webdav/dmsf_webdav_head_test.rb b/test/integration/webdav/dmsf_webdav_head_test.rb
index 86301048..98f55d1f 100644
--- a/test/integration/webdav/dmsf_webdav_head_test.rb
+++ b/test/integration/webdav/dmsf_webdav_head_test.rb
@@ -42,7 +42,7 @@ class DmsfWebdavHeadTest < RedmineDmsf::Test::IntegrationTest
     Setting.plugin_redmine_dmsf['dmsf_webdav_use_project_names'] = false
     @dmsf_storage_directory = Setting.plugin_redmine_dmsf['dmsf_storage_directory']
     Setting.plugin_redmine_dmsf['dmsf_storage_directory'] = File.expand_path('../../../fixtures/dmsf', __FILE__)
-    FileUtils.cp_r(File.expand_path('../../../fixtures/files', __FILE__), Setting.plugin_redmine_dmsf['dmsf_storage_directory'])
+    FileUtils.cp_r File.expand_path('../../../fixtures/files', __FILE__), DmsfFile.storage_path
     User.current = nil    
   end
 
diff --git a/test/integration/webdav/dmsf_webdav_mkcol_test.rb b/test/integration/webdav/dmsf_webdav_mkcol_test.rb
index 9c8f11f4..b6791b3f 100644
--- a/test/integration/webdav/dmsf_webdav_mkcol_test.rb
+++ b/test/integration/webdav/dmsf_webdav_mkcol_test.rb
@@ -41,7 +41,7 @@ class DmsfWebdavMkcolTest < RedmineDmsf::Test::IntegrationTest
     Setting.plugin_redmine_dmsf['dmsf_webdav_use_project_names'] = false
     @dmsf_storage_directory = Setting.plugin_redmine_dmsf['dmsf_storage_directory']
     Setting.plugin_redmine_dmsf['dmsf_storage_directory'] = File.expand_path('../../../fixtures/dmsf', __FILE__)
-    FileUtils.cp_r(File.expand_path('../../../fixtures/files', __FILE__), Setting.plugin_redmine_dmsf['dmsf_storage_directory'])
+    FileUtils.cp_r File.expand_path('../../../fixtures/files', __FILE__), DmsfFile.storage_path
     User.current = nil        
   end
 
diff --git a/test/integration/webdav/dmsf_webdav_move_test.rb b/test/integration/webdav/dmsf_webdav_move_test.rb
index 80057c76..80fbbbfe 100644
--- a/test/integration/webdav/dmsf_webdav_move_test.rb
+++ b/test/integration/webdav/dmsf_webdav_move_test.rb
@@ -30,7 +30,7 @@ class DmsfWebdavMoveTest < RedmineDmsf::Test::IntegrationTest
   def setup
     @dmsf_storage_directory = Setting.plugin_redmine_dmsf['dmsf_storage_directory']
     Setting.plugin_redmine_dmsf['dmsf_storage_directory'] = File.expand_path('../../../fixtures/dmsf', __FILE__)
-    FileUtils.cp_r(File.expand_path('../../../fixtures/files', __FILE__), Setting.plugin_redmine_dmsf['dmsf_storage_directory'])
+    FileUtils.cp_r File.expand_path('../../../fixtures/files', __FILE__), DmsfFile.storage_path
     @admin = credentials 'admin'
     @jsmith = credentials 'jsmith'
     @project1 = Project.find 1
diff --git a/test/integration/webdav/dmsf_webdav_put_test.rb b/test/integration/webdav/dmsf_webdav_put_test.rb
index 5de1eb95..3e66d61a 100644
--- a/test/integration/webdav/dmsf_webdav_put_test.rb
+++ b/test/integration/webdav/dmsf_webdav_put_test.rb
@@ -30,7 +30,7 @@ class DmsfWebdavPutTest < RedmineDmsf::Test::IntegrationTest
   def setup
     @dmsf_storage_directory = Setting.plugin_redmine_dmsf['dmsf_storage_directory']
     Setting.plugin_redmine_dmsf['dmsf_storage_directory'] = File.expand_path('../../../fixtures/dmsf', __FILE__)
-    FileUtils.cp_r(File.expand_path('../../../fixtures/files', __FILE__), Setting.plugin_redmine_dmsf['dmsf_storage_directory'])
+    FileUtils.cp_r File.expand_path('../../../fixtures/files', __FILE__), DmsfFile.storage_path
     @admin = credentials 'admin'
     @jsmith = credentials 'jsmith'
     @project1 = Project.find 1
diff --git a/test/unit/dmsf_file_revision_test.rb b/test/unit/dmsf_file_revision_test.rb
index d1d5f165..55977c78 100644
--- a/test/unit/dmsf_file_revision_test.rb
+++ b/test/unit/dmsf_file_revision_test.rb
@@ -38,7 +38,7 @@ class DmsfFileRevisionTest < RedmineDmsf::Test::UnitTest
     @jsmith = User.find 2
     @dmsf_storage_directory = Setting.plugin_redmine_dmsf['dmsf_storage_directory']
     Setting.plugin_redmine_dmsf['dmsf_storage_directory'] = File.expand_path('../../fixtures/dmsf', __FILE__)
-    FileUtils.cp_r(File.expand_path('../../fixtures/files', __FILE__), Setting.plugin_redmine_dmsf['dmsf_storage_directory'])
+    FileUtils.cp_r File.expand_path('../../fixtures/files', __FILE__), DmsfFile.storage_path
   end
 
   def teardown