redmine_plugins/redmine_dmsf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Errors handling

Browse Source
This commit is contained in:
Karel Pičman 2020-01-14 15:38:56 +01:00
parent 8a5d8ff6ec
commit 21c1a72026
12 changed files with 76 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
app/controllers/dmsf_controller.rb
View File

@ -89,14 +89,14 @@ class DmsfController < ApplicationController
def download_email_entries def download_email_entries
# IE has got a tendency to cache files # IE has got a tendency to cache files
expires_in(0.year, "must-revalidate" => true) expires_in(0.year, 'must-revalidate' => true)
send_file( send_file(
params[:path], params[:path],
:filename => 'Documents.zip', filename: 'Documents.zip',
:type => 'application/zip', type: 'application/zip',
:disposition => 'attachment') disposition: 'attachment')
rescue => e rescue => e
flash[:errors] = e.message flash[:error] = e.message
end end
def entries_operation def entries_operation
@ -153,7 +153,7 @@ class DmsfController < ApplicationController
rescue DmsfAccessError rescue DmsfAccessError
render_403 render_403
rescue StandardError => e rescue StandardError => e
flash[:errors] = e.message flash[:error] = e.message
Rails.logger.error e.message Rails.logger.error e.message
end end
end end
@ -170,7 +170,7 @@ class DmsfController < ApplicationController
def entries_email def entries_email
if params[:email][:to].strip.blank? if params[:email][:to].strip.blank?
flash[:errors] = l(:error_email_to_must_be_entered) flash[:error] = l(:error_email_to_must_be_entered)
else else
DmsfMailer.deliver_send_documents(@project, params[:email].permit!, User.current) DmsfMailer.deliver_send_documents(@project, params[:email].permit!, User.current)
File.delete(params[:email][:zipped_content]) File.delete(params[:email][:zipped_content])
@ -249,7 +249,7 @@ class DmsfController < ApplicationController
if result if result
flash[:notice] = l(:notice_folder_deleted) flash[:notice] = l(:notice_folder_deleted)
else else
flash[:errors] = @folder.errors.full_messages.to_sentence flash[:error] = @folder.errors.full_messages.to_sentence
end end
respond_to do |format| respond_to do |format|
format.html do format.html do
@ -267,7 +267,7 @@ class DmsfController < ApplicationController
if @folder.restore if @folder.restore
flash[:notice] = l(:notice_dmsf_folder_restored) flash[:notice] = l(:notice_dmsf_folder_restored)
else else
flash[:errors] = @folder.errors.full_messages.to_sentence flash[:error] = @folder.errors.full_messages.to_sentence
end end
redirect_to :back redirect_to :back
end end
@ -281,7 +281,7 @@ class DmsfController < ApplicationController
if @project.save if @project.save
flash[:notice] = l(:notice_folder_details_were_saved) flash[:notice] = l(:notice_folder_details_were_saved)
else else
flash[:errors] = @project.errors.full_messages.to_sentence flash[:error] = @project.errors.full_messages.to_sentence
end end
end end
redirect_to dmsf_folder_path(:id => @project) redirect_to dmsf_folder_path(:id => @project)
@ -339,7 +339,7 @@ class DmsfController < ApplicationController
@folder.unlock! @folder.unlock!
flash[:notice] = l(:notice_folder_unlocked) flash[:notice] = l(:notice_folder_unlocked)
else else
flash[:errors] = l(:error_only_user_that_locked_folder_can_unlock_it) flash[:error] = l(:error_only_user_that_locked_folder_can_unlock_it)
end end
end end
redirect_to :back redirect_to :back
@ -455,7 +455,7 @@ class DmsfController < ApplicationController
folder = DmsfFolder.find_by(id: id) folder = DmsfFolder.find_by(id: id)
if folder if folder
unless folder.restore unless folder.restore
flash[:errors] = folder.errors.full_messages.to_sentence flash[:error] = folder.errors.full_messages.to_sentence
end end
else else
raise FileNotFound raise FileNotFound
@ -466,7 +466,7 @@ class DmsfController < ApplicationController
file = DmsfFile.find_by(id: id) file = DmsfFile.find_by(id: id)
if file if file
unless file.restore unless file.restore
flash[:errors] = file.errors.full_messages.to_sentence flash[:error] = file.errors.full_messages.to_sentence
end end
else else
raise FileNotFound raise FileNotFound
@ -477,7 +477,7 @@ class DmsfController < ApplicationController
link = DmsfLink.find_by(id: id) link = DmsfLink.find_by(id: id)
if link if link
unless link.restore unless link.restore
flash[:errors] = link.errors.full_messages.to_sentence flash[:error] = link.errors.full_messages.to_sentence
end end
else else
raise FileNotFound raise FileNotFound
@ -492,7 +492,7 @@ class DmsfController < ApplicationController
folder = DmsfFolder.find_by(id: id) folder = DmsfFolder.find_by(id: id)
if folder if folder
unless folder.delete commit unless folder.delete commit
flash[:errors] = folder.errors.full_messages.to_sentence flash[:error] = folder.errors.full_messages.to_sentence
return return
end end
elsif !commit elsif !commit
@ -544,7 +544,7 @@ class DmsfController < ApplicationController
link = DmsfLink.find_by(id: id) link = DmsfLink.find_by(id: id)
link.delete commit if link link.delete commit if link
end end
if flash[:errors].blank? && flash[:warning].blank? if flash[:error].blank? && flash[:warning].blank?
flash[:notice] = l(:notice_entries_deleted) flash[:notice] = l(:notice_entries_deleted)
end end
end end

26
app/controllers/dmsf_files_controller.rb
View File

@ -96,7 +96,7 @@ class DmsfFilesController < ApplicationController
def create_revision def create_revision
if params[:dmsf_file_revision] if params[:dmsf_file_revision]
if @file.locked_for_user? if @file.locked_for_user?
flash[:errors] = l(:error_file_is_locked) flash[:error] = l(:error_file_is_locked)
else else
revision = DmsfFileRevision.new revision = DmsfFileRevision.new
revision.title = params[:dmsf_file_revision][:title] revision.title = params[:dmsf_file_revision][:title]
@ -186,10 +186,10 @@ class DmsfFilesController < ApplicationController
Rails.logger.error "Could not send email notifications: #{e.message}" Rails.logger.error "Could not send email notifications: #{e.message}"
end end
else else
flash[:errors] = @file.errors.full_messages.join(', ') flash[:error] = @file.errors.full_messages.to_sentence
end end
else else
flash[:errors] = revision.errors.full_messages.join(', ') flash[:error] = revision.errors.full_messages.to_sentence
end end
end end
end end
@ -217,8 +217,8 @@ class DmsfFilesController < ApplicationController
end end
end end
else else
msg = @file.errors.full_messages.join(', ') msg = @file.errors.full_messages.to_sentence
flash[:errors] = msg flash[:error] = msg
Rails.logger.error msg Rails.logger.error msg
end end
end end
@ -243,10 +243,10 @@ class DmsfFilesController < ApplicationController
end end
flash[:notice] = l(:notice_revision_deleted) flash[:notice] = l(:notice_revision_deleted)
else else
flash[:errors] = @revision.errors.full_messages.join(', ') flash[:error] = @revision.errors.full_messages.to_sentence
end end
end end
redirect_to :action => 'show', :id => @file redirect_to action: 'show', id: @file
end end
def obsolete_revision def obsolete_revision
@ -254,10 +254,10 @@ class DmsfFilesController < ApplicationController
if @revision.obsolete if @revision.obsolete
flash[:notice] = l(:notice_revision_obsoleted) flash[:notice] = l(:notice_revision_obsoleted)
else else
flash[:errors] = @revision.errors.full_messages.join(', ') flash[:error] = @revision.errors.full_messages.to_sentence
end end
end end
redirect_to :action => 'show', :id => @file redirect_to action: 'show', id: @file
end end
def lock def lock
@ -268,7 +268,7 @@ class DmsfFilesController < ApplicationController
@file.lock! @file.lock!
flash[:notice] = l(:notice_file_locked) flash[:notice] = l(:notice_file_locked)
rescue => e rescue => e
flash[:errors] = e.message flash[:error] = e.message
end end
end end
redirect_to :back redirect_to :back
@ -283,10 +283,10 @@ class DmsfFilesController < ApplicationController
@file.unlock! @file.unlock!
flash[:notice] = l(:notice_file_unlocked) flash[:notice] = l(:notice_file_unlocked)
rescue => e rescue => e
flash[:errors] = e.message flash[:error] = e.message
end end
else else
flash[:errors] = l(:error_only_user_that_locked_file_can_unlock_it) flash[:error] = l(:error_only_user_that_locked_file_can_unlock_it)
end end
end end
redirect_to :back redirect_to :back
@ -316,7 +316,7 @@ class DmsfFilesController < ApplicationController
if @file.restore if @file.restore
flash[:notice] = l(:notice_dmsf_file_restored) flash[:notice] = l(:notice_dmsf_file_restored)
else else
flash[:errors] = @file.errors.full_messages.to_sentence flash[:error] = @file.errors.full_messages.to_sentence
end end
redirect_to :back redirect_to :back
end end

4
app/controllers/dmsf_files_copy_controller.rb
View File

@ -39,7 +39,7 @@ class DmsfFilesCopyController < ApplicationController
def copy def copy
new_file = @file.copy_to(@target_project, @target_folder) new_file = @file.copy_to(@target_project, @target_folder)
unless new_file.errors.empty? unless new_file.errors.empty?
flash[:error] = new_file.errors.full_messages.join(', ') flash[:error] = new_file.errors.full_messages.to_sentence
redirect_to :action => 'new', :id => @file, :target_project_id => @target_project, redirect_to :action => 'new', :id => @file, :target_project_id => @target_project,
:target_folder_id => @target_folder :target_folder_id => @target_folder
return return
@ -50,7 +50,7 @@ class DmsfFilesCopyController < ApplicationController
def move def move
unless @file.move_to(@target_project, @target_folder) unless @file.move_to(@target_project, @target_folder)
flash[:error] = @file.errors.full_messages.join(', ') flash[:error] = @file.errors.full_messages.to_sentence
redirect_to :action => 'new', :id => @file, :target_project_id => @target_project, redirect_to :action => 'new', :id => @file, :target_project_id => @target_project,
:target_folder_id => @target_folder :target_folder_id => @target_folder
return return

4
app/controllers/dmsf_folders_copy_controller.rb
View File

@ -39,7 +39,7 @@ class DmsfFoldersCopyController < ApplicationController
def copy def copy
new_folder = @folder.copy_to(@target_project, @target_folder) new_folder = @folder.copy_to(@target_project, @target_folder)
unless new_folder.errors.empty? unless new_folder.errors.empty?
flash[:error] = new_folder.errors.full_messages.join(', ') flash[:error] = new_folder.errors.full_messages.to_sentence
redirect_to :action => 'new', :id => @folder, :target_project_id => @target_project, redirect_to :action => 'new', :id => @folder, :target_project_id => @target_project,
:target_folder_id => @target_folder :target_folder_id => @target_folder
return return
@ -55,7 +55,7 @@ class DmsfFoldersCopyController < ApplicationController
flash[:notice] = l(:notice_successful_update) flash[:notice] = l(:notice_successful_update)
redirect_to dmsf_folder_path(:id => @target_project, :folder_id => @folder) redirect_to dmsf_folder_path(:id => @target_project, :folder_id => @folder)
else else
flash[:error] = @folder.errors.full_messages.join(', ') flash[:error] = @folder.errors.full_messages.to_sentence
redirect_to :action => 'new', :id => @folder, :target_project_id => @target_project, redirect_to :action => 'new', :id => @folder, :target_project_id => @target_project,
:target_folder_id => @target_folder :target_folder_id => @target_folder
end end

6
app/controllers/dmsf_links_controller.rb
View File

@ -114,7 +114,7 @@ class DmsfLinksController < ApplicationController
flash[:notice] = l(:notice_successful_create) flash[:notice] = l(:notice_successful_create)
else else
msg = @dmsf_link.errors.full_messages.to_sentence msg = @dmsf_link.errors.full_messages.to_sentence
flash[:errors] = msg flash[:error] = msg
Rails.logger.error msg Rails.logger.error msg
end end
else else
@ -144,7 +144,7 @@ class DmsfLinksController < ApplicationController
if result if result
flash[:notice] = l(:notice_successful_create) flash[:notice] = l(:notice_successful_create)
else else
flash[:errors] = @dmsf_link.errors.full_messages.to_sentence flash[:error] = @dmsf_link.errors.full_messages.to_sentence
end end
end end
respond_to do |format| respond_to do |format|
@ -172,7 +172,7 @@ class DmsfLinksController < ApplicationController
flash[:notice] = l(:notice_successful_delete) flash[:notice] = l(:notice_successful_delete)
else else
@dmsf_link.errors.each do |e, msg| @dmsf_link.errors.each do |e, msg|
flash[:errors] = msg flash[:error] = msg
end end
end end
end end

2
app/controllers/dmsf_state_controller.rb
View File

@ -36,7 +36,7 @@ class DmsfStateController < ApplicationController
if format_valid?(member.dmsf_title_format) && member.save if format_valid?(member.dmsf_title_format) && member.save
flash[:notice] = l(:notice_your_preferences_were_saved) flash[:notice] = l(:notice_your_preferences_were_saved)
else else
flash[:errors] = l(:notice_your_preferences_were_not_saved) flash[:error] = l(:notice_your_preferences_were_not_saved)
end end
else else
flash[:warning] = l(:user_is_not_project_member) flash[:warning] = l(:user_is_not_project_member)

28
app/controllers/dmsf_workflows_controller.rb
View File

@ -204,12 +204,12 @@ class DmsfWorkflowsController < ApplicationController
flash[:notice] = l(:notice_successful_update) flash[:notice] = l(:notice_successful_update)
end end
else else
flash[:errors] = l(:error_workflow_assign) flash[:error] = l(:error_workflow_assign)
end end
end end
end end
rescue => e rescue => e
flash[:errors] = e.message flash[:error] = e.message
end end
redirect_to :back redirect_to :back
return return
@ -289,12 +289,12 @@ class DmsfWorkflowsController < ApplicationController
if res if res
flash[:notice] = l(:notice_successful_update) flash[:notice] = l(:notice_successful_update)
if @project if @project
redirect_to settings_project_path(@project, :tab => 'dmsf_workflow') redirect_to settings_project_path(@project, tab: 'dmsf_workflow')
else else
redirect_to dmsf_workflows_path redirect_to dmsf_workflows_path
end end
else else
flash[:errors] = @dmsf_workflow.errors.full_messages.to_sentence flash[:error] = @dmsf_workflow.errors.full_messages.to_sentence
redirect_to dmsf_workflow_path(@dmsf_workflow) redirect_to dmsf_workflow_path(@dmsf_workflow)
end end
else else
@ -307,10 +307,10 @@ class DmsfWorkflowsController < ApplicationController
@dmsf_workflow.destroy @dmsf_workflow.destroy
flash[:notice] = l(:notice_successful_delete) flash[:notice] = l(:notice_successful_delete)
rescue rescue
flash[:errors] = l(:error_unable_delete_dmsf_workflow) flash[:error] = l(:error_unable_delete_dmsf_workflow)
end end
if @project if @project
redirect_to settings_project_path(@project, :tab => 'dmsf_workflow') redirect_to settings_project_path(@project, tab: 'dmsf_workflow')
else else
redirect_to dmsf_workflows_path redirect_to dmsf_workflows_path
end end
@ -351,11 +351,11 @@ class DmsfWorkflowsController < ApplicationController
if ws.save if ws.save
@dmsf_workflow.dmsf_workflow_steps << ws @dmsf_workflow.dmsf_workflow_steps << ws
else else
flash[:errors] = ws.errors.full_messages.to_sentence flash[:error] = ws.errors.full_messages.to_sentence
end end
end end
else else
flash[:errors] = l(:error_workflow_assign) flash[:error] = l(:error_workflow_assign)
end end
end end
respond_to do |format| respond_to do |format|
@ -373,7 +373,7 @@ class DmsfWorkflowsController < ApplicationController
if n > params[:step].to_i if n > params[:step].to_i
ws.step = n - 1 ws.step = n - 1
unless ws.save unless ws.save
flash[:errors] = l(:notice_cannot_renumber_steps) flash[:error] = l(:notice_cannot_renumber_steps)
end end
end end
end end
@ -384,7 +384,7 @@ class DmsfWorkflowsController < ApplicationController
def reorder_steps def reorder_steps
if request.put? if request.put?
unless @dmsf_workflow.reorder_steps(params[:step].to_i, params[:dmsf_workflow][:position].to_i) unless @dmsf_workflow.reorder_steps(params[:step].to_i, params[:dmsf_workflow][:position].to_i)
flash[:errors] = l(:notice_cannot_renumber_steps) flash[:error] = l(:notice_cannot_renumber_steps)
end end
end end
respond_to do |format| respond_to do |format|
@ -403,7 +403,7 @@ class DmsfWorkflowsController < ApplicationController
@dmsf_workflow.notify_users(@project, revision, self) @dmsf_workflow.notify_users(@project, revision, self)
flash[:notice] = l(:notice_workflow_started) flash[:notice] = l(:notice_workflow_started)
else else
flash[:errors] = l(:notice_cannot_start_workflow) flash[:error] = l(:notice_cannot_start_workflow)
end end
end end
redirect_to :back redirect_to :back
@ -419,11 +419,11 @@ class DmsfWorkflowsController < ApplicationController
@dmsf_workflow.dmsf_workflow_steps.where(step: step.step).find_each do |s| @dmsf_workflow.dmsf_workflow_steps.where(step: step.step).find_each do |s|
s.name = step.name s.name = step.name
unless s.save unless s.save
flash[:errors] = s.errors.full_messages.to_sentence flash[:error] = s.errors.full_messages.to_sentence
end end
end end
else else
flash[:errors] = step.errors.full_messages.to_sentence flash[:error] = step.errors.full_messages.to_sentence
end end
end end
# Operators/Assignees # Operators/Assignees
@ -434,7 +434,7 @@ class DmsfWorkflowsController < ApplicationController
step.operator = operator.to_i step.operator = operator.to_i
step.user_id = params[:assignee][id] step.user_id = params[:assignee][id]
unless step.save unless step.save
flash[:errors] = step.errors.full_messages.to_sentence flash[:error] = step.errors.full_messages.to_sentence
Rails.logger.error step.errors.full_messages.to_sentence Rails.logger.error step.errors.full_messages.to_sentence
end end
end end

2
app/helpers/dmsf_upload_helper.rb
View File

@ -112,7 +112,7 @@ module DmsfUploadHelper
end end
rescue => e rescue => e
Rails.logger.error e.message Rails.logger.error e.message
controller.flash[:errors] = e.message if controller controller.flash[:error] = e.message if controller
failed_uploads.push(file) failed_uploads.push(file)
end end
else else

2
app/views/dmsf_upload/upload.js.erb
View File

@ -23,7 +23,7 @@
var fileSpan = $('#dmsf_attachments_<%= j params[:attachment_id] %>'); var fileSpan = $('#dmsf_attachments_<%= j params[:attachment_id] %>');
<% if @attachment.new_record? %> <% if @attachment.new_record? %>
fileSpan.hide(); fileSpan.hide();
alert("<%= escape_javascript @attachment.errors.full_messages.join(', ') %>"); alert("<%= escape_javascript @attachment.errors.full_messages.to_sentence %>");
<% else %> <% else %>
$('<input>', { type: 'hidden', name: 'dmsf_attachments[<%= j params[:attachment_id] %>][token]' } ).val('<%= j @attachment.token %>').appendTo(fileSpan); $('<input>', { type: 'hidden', name: 'dmsf_attachments[<%= j params[:attachment_id] %>][token]' } ).val('<%= j @attachment.token %>').appendTo(fileSpan);
fileSpan.find('a.dmsf-remove-upload') fileSpan.find('a.dmsf-remove-upload')

8
lib/redmine_dmsf/hooks/controllers/issues_controller_hooks.rb
View File

@ -91,7 +91,7 @@ module RedmineDmsf
if old_system_folder if old_system_folder
old_system_folder.title = "#{issue.id} - #{DmsfFolder::get_valid_title(issue.subject)}" old_system_folder.title = "#{issue.id} - #{DmsfFolder::get_valid_title(issue.subject)}"
unless old_system_folder.save unless old_system_folder.save
controller.flash[:errors] = old_system_folder.errors.full_messages.to_sentence controller.flash[:error] = old_system_folder.errors.full_messages.to_sentence
Rails.logger.error old_system_folder.errors.full_messages.to_sentence Rails.logger.error old_system_folder.errors.full_messages.to_sentence
end end
end end
@ -103,20 +103,20 @@ module RedmineDmsf
old_system_folder.dmsf_folder_id = new_main_system_folder.id old_system_folder.dmsf_folder_id = new_main_system_folder.id
old_system_folder.project_id = project_id old_system_folder.project_id = project_id
unless old_system_folder.save unless old_system_folder.save
controller.flash[:errors] = old_system_folder.errors.full_messages.to_sentence controller.flash[:error] = old_system_folder.errors.full_messages.to_sentence
Rails.logger.error old_system_folder.errors.full_messages.to_sentence Rails.logger.error old_system_folder.errors.full_messages.to_sentence
end end
issue.dmsf_files.each do |dmsf_file| issue.dmsf_files.each do |dmsf_file|
dmsf_file.project_id = project_id dmsf_file.project_id = project_id
unless dmsf_file.save unless dmsf_file.save
controller.flash[:errors] = dmsf_file.errors.full_messages.to_sentence controller.flash[:error] = dmsf_file.errors.full_messages.to_sentence
Rails.logger.error dmsf_file.errors.full_messages.to_sentence Rails.logger.error dmsf_file.errors.full_messages.to_sentence
end end
end end
issue.dmsf_links.each do | dmsf_link| issue.dmsf_links.each do | dmsf_link|
dmsf_link.project_id = project_id dmsf_link.project_id = project_id
unless dmsf_link.save unless dmsf_link.save
controller.flash[:errors] = dmsf_link.errors.full_messages.to_sentence controller.flash[:error] = dmsf_link.errors.full_messages.to_sentence
Rails.logger.error dmsf_link.errors.full_messages.to_sentence Rails.logger.error dmsf_link.errors.full_messages.to_sentence
end end
end end

27
test/functional/dmsf_controller_test.rb
View File

@ -133,9 +133,9 @@ class DmsfControllerTest < RedmineDmsf::Test::TestCase
def test_delete_not_empty def test_delete_not_empty
# Permissions OK but the folder is not empty # Permissions OK but the folder is not empty
@role.add_permission! :folder_manipulation @role.add_permission! :folder_manipulation
get :delete, :params => {:id => @project, :folder_id => @folder1.id, :commit => false} get :delete, params: { id: @project, folder_id: @folder1.id, commit: false}
assert_response :redirect assert_response :redirect
assert_include l(:error_folder_is_not_empty), flash[:errors] assert_include l(:error_folder_is_not_empty), flash[:error]
end end
def test_delete_locked def test_delete_locked
@ -144,7 +144,7 @@ class DmsfControllerTest < RedmineDmsf::Test::TestCase
@request.env['HTTP_REFERER'] = dmsf_folder_path(id: @project.id, folder_id: @folder2.id) @request.env['HTTP_REFERER'] = dmsf_folder_path(id: @project.id, folder_id: @folder2.id)
get :delete, params: { id: @project, folder_id: @folder2.id, commit: false} get :delete, params: { id: @project, folder_id: @folder2.id, commit: false}
assert_response :redirect assert_response :redirect
assert_include l(:error_folder_is_locked), flash[:errors] assert_include l(:error_folder_is_locked), flash[:error]
end end
def test_delete_ok def test_delete_ok
@ -185,10 +185,10 @@ class DmsfControllerTest < RedmineDmsf::Test::TestCase
@request.env['HTTP_REFERER'] = dmsf_folder_path(:id => @project.id) @request.env['HTTP_REFERER'] = dmsf_folder_path(:id => @project.id)
@role.add_permission! :folder_manipulation @role.add_permission! :folder_manipulation
@role.add_permission! :view_dmsf_files @role.add_permission! :view_dmsf_files
get :entries_operation, :params => {:id => @project, :delete_entries => 'Delete', get :entries_operation, params: { id: @project, delete_entries: 'Delete',
:ids => ["folder-#{@folder1.id}", "file-#{@file1.id}", "folder-link-#{@folder_link1.id}", "file-link-#{@file_link2.id}"]} ids: ["folder-#{@folder1.id}", "file-#{@file1.id}", "folder-link-#{@folder_link1.id}", "file-link-#{@file_link2.id}"]}
assert_response :redirect assert_response :redirect
assert_equal flash[:errors].to_s, l(:error_folder_is_not_empty) assert_equal flash[:error].to_s, l(:error_folder_is_not_empty)
end end
def test_delete_entries_ok def test_delete_entries_ok
@ -197,21 +197,22 @@ class DmsfControllerTest < RedmineDmsf::Test::TestCase
@role.add_permission! :view_dmsf_files @role.add_permission! :view_dmsf_files
@role.add_permission! :folder_manipulation @role.add_permission! :folder_manipulation
@role.add_permission! :file_delete @role.add_permission! :file_delete
flash[:errors] = nil flash[:error] = nil
get :entries_operation, :params => {:id => @project, :delete_entries => 'Delete', get :entries_operation, params: { id: @project, delete_entries: 'Delete',
:ids => ["folder-#{@folder7.id}", "file-#{@file1.id}", "file-link-#{@file_link2.id}"]} ids: ["folder-#{@folder7.id}", "file-#{@file1.id}", "file-link-#{@file_link2.id}"]}
assert_response :redirect assert_response :redirect
assert_nil flash[:errors] assert_nil flash[:error]
end end
def test_restore_entries def test_restore_entries
# Restore # Restore
@role.add_permission! :view_dmsf_files @role.add_permission! :view_dmsf_files
@request.env['HTTP_REFERER'] = trash_dmsf_path(:id => @project.id) @request.env['HTTP_REFERER'] = trash_dmsf_path(:id => @project.id)
get :entries_operation, :params => {:id => @project, :restore_entries => 'Restore', flash[:error] = nil
:ids => ["file-#{@file1.id}", "file-link-#{@file_link2.id}"]} get :entries_operation, params: { id: @project, restore_entries: 'Restore',
ids: ["file-#{@file1.id}", "file-link-#{@file_link2.id}"]}
assert_response :redirect assert_response :redirect
assert_nil flash[:errors] assert_nil flash[:error]
end end
def test_show def test_show

10
test/functional/dmsf_files_controller_test.rb
View File

@ -90,18 +90,18 @@ class DmsfFilesControllerTest < RedmineDmsf::Test::TestCase
def delete_locked def delete_locked
# Permissions OK but the file is locked # Permissions OK but the file is locked
@role.add_permission! :file_delete @role.add_permission! :file_delete
delete @file, :params => {:commit => false} delete @file, params: { commit: false }
assert_response :redirect assert_response :redirect
assert_include l(:error_file_is_locked), flash[:errors] assert_include l(:error_file_is_locked), flash[:error]
end end
def delete_ok def delete_ok
# Permissions OK and not locked # Permissions OK and not locked
flash[:errors].clear flash[:error].clear
@file.unlock! @file.unlock!
delete @file, :params => {:commit => false} delete @file, params: { commit: false }
assert_response :redirect assert_response :redirect
assert_equal 0, flash[:errors].size assert_equal 0, flash[:error].size
end end
def test_obsolete_revision_ok def test_obsolete_revision_ok