diff --git a/app/controllers/dmsf_files_copy_controller.rb b/app/controllers/dmsf_files_copy_controller.rb index 03f710ad..f432718b 100644 --- a/app/controllers/dmsf_files_copy_controller.rb +++ b/app/controllers/dmsf_files_copy_controller.rb @@ -36,7 +36,7 @@ class DmsfFilesCopyController < ApplicationController def copy new_file = @file.copy_to(@target_project, @target_folder) unless new_file.errors.empty? - flash[:errors] = new_file.errors.full_messages.join(', ') + flash[:error] = new_file.errors.full_messages.join(', ') redirect_to :action => 'new', :id => @file, :target_project_id => @target_project, :target_folder_id => @target_folder return @@ -47,7 +47,7 @@ class DmsfFilesCopyController < ApplicationController def move unless @file.move_to(@target_project, @target_folder) - flash[:errors] = @file.errors.full_messages.join(', ') + flash[:error] = @file.errors.full_messages.join(', ') redirect_to :action => 'new', :id => @file, :target_project_id => @target_project, :target_folder_id => @target_folder return @@ -89,7 +89,7 @@ private def check_target_folder if (@target_folder && @target_folder == @file.dmsf_folder) || (@target_folder.nil? && @file.dmsf_folder.nil? && @target_project == @file.project) - flash[:errors] = l(:error_target_folder_same) + flash[:error] = l(:error_target_folder_same) redirect_to :action => :new, :id => @file, :target_project_id => @target_project.id, :target_folder_id => @target_folder return diff --git a/app/controllers/dmsf_folders_copy_controller.rb b/app/controllers/dmsf_folders_copy_controller.rb index bca88feb..c3c8ba9f 100644 --- a/app/controllers/dmsf_folders_copy_controller.rb +++ b/app/controllers/dmsf_folders_copy_controller.rb @@ -36,7 +36,7 @@ class DmsfFoldersCopyController < ApplicationController def copy new_folder = @folder.copy_to(@target_project, @target_folder) unless new_folder.errors.empty? - flash[:errors] = new_folder.errors.full_messages.join(', ') + flash[:error] = new_folder.errors.full_messages.join(', ') redirect_to :action => 'new', :id => @folder, :target_project_id => @target_project, :target_folder_id => @target_folder return @@ -52,7 +52,7 @@ class DmsfFoldersCopyController < ApplicationController flash[:notice] = l(:notice_successful_update) redirect_to dmsf_folder_path(:id => @target_project, :folder_id => @folder) else - flash[:errors] = @folder.errors.full_messages.join(', ') + flash[:error] = @folder.errors.full_messages.join(', ') redirect_to :action => 'new', :id => @folder, :target_project_id => @target_project, :target_folder_id => @target_folder end @@ -91,7 +91,7 @@ class DmsfFoldersCopyController < ApplicationController def check_target_folder if (@target_folder && @target_folder == @folder.dmsf_folder) || (@target_folder.nil? && @folder.dmsf_folder.nil? && @target_project == @folder.project) - flash[:errors] = l(:error_target_folder_same) + flash[:error] = l(:error_target_folder_same) redirect_to :action => :new, :id => @folder, :target_project_id => @target_project.id, :target_folder_id => @target_folder return