From a4a00828d12f5d7a2b9000f7d259a654f25021fe Mon Sep 17 00:00:00 2001 From: "karel.picman@lbcfree.net" Date: Thu, 25 Jun 2020 15:26:34 +0200 Subject: [PATCH] New folder icon --- app/models/dmsf_upload.rb | 4 ++-- test/functional/dmsf_controller_test.rb | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/app/models/dmsf_upload.rb b/app/models/dmsf_upload.rb index 50237f6e..9b851ffb 100644 --- a/app/models/dmsf_upload.rb +++ b/app/models/dmsf_upload.rb @@ -41,7 +41,7 @@ class DmsfUpload end def self.create_from_uploaded_attachment(project, folder, uploaded_file) - a = Attachment.find_by_token(uploaded_file[:token]) + a = Attachment.find_by_token(uploaded_file[:token]) if uploaded_file[:token].present? if a uploaded = { disk_filename: DmsfHelper.temp_filename(a.filename), @@ -50,7 +50,7 @@ class DmsfUpload comment: uploaded_file[:description], tempfile_path: a.diskfile } - DmsfUpload.new(project, folder, uploaded) + DmsfUpload.new project, folder, uploaded else Rails.logger.error "An attachment not found by its token: #{uploaded_file[:token]}" nil diff --git a/test/functional/dmsf_controller_test.rb b/test/functional/dmsf_controller_test.rb index deb4ae6c..eb4a314e 100644 --- a/test/functional/dmsf_controller_test.rb +++ b/test/functional/dmsf_controller_test.rb @@ -219,10 +219,13 @@ class DmsfControllerTest < RedmineDmsf::Test::TestCase @role.add_permission! :view_dmsf_files @role.add_permission! :view_dmsf_folders @role.add_permission! :file_manipulation + @role.add_permission! :folder_manipulation get :show, params: { id: @project.id } assert_response :success # New file link assert_select 'a[href$=?]', '/dmsf/upload/multi_upload' + # New folder link + assert_select 'a[href$=?]', '/dmsf/new' # Filters assert_select 'fieldset#filters' # Options