From f94bf061b3774d5f6125df4332d381c0921facc1 Mon Sep 17 00:00:00 2001 From: "karel.picman@lbcfree.net" Date: Thu, 4 Mar 2021 11:26:35 +0100 Subject: [PATCH] #1217 Global DMS --- app/controllers/dmsf_controller.rb | 22 +++++++++---------- app/controllers/dmsf_files_controller.rb | 14 ++++++------ .../dmsf_folders_copy_controller.rb | 4 ++-- app/controllers/dmsf_links_controller.rb | 2 +- app/controllers/dmsf_workflows_controller.rb | 10 ++++----- .../dmsf_workflow_controller_test.rb | 2 +- 6 files changed, 27 insertions(+), 27 deletions(-) diff --git a/app/controllers/dmsf_controller.rb b/app/controllers/dmsf_controller.rb index 23f2a3a2..5df30041 100644 --- a/app/controllers/dmsf_controller.rb +++ b/app/controllers/dmsf_controller.rb @@ -152,7 +152,7 @@ class DmsfController < ApplicationController selected_dir_links.blank? && selected_file_links.blank? && selected_url_links.blank? flash[:warning] = l(:warning_no_entries_selected) - redirect_back_or_default dmsf_path(id: @project, folder_id: @folder) + redirect_back_or_default dmsf_folder_path(id: @project.id, folder_id: @folder) return end @@ -171,13 +171,13 @@ class DmsfController < ApplicationController email_entries(selected_folders, selected_files) elsif params[:restore_entries].present? restore_entries(selected_folders, selected_files, selected_dir_links, selected_file_links, selected_url_links) - redirect_back_or_default dmsf_path(id: @project, folder_id: @folder) + redirect_back_or_default dmsf_folder_path(id: @project.id, folder_id: @folder) elsif params[:delete_entries].present? delete_entries(selected_folders, selected_files, selected_dir_links, selected_file_links, selected_url_links, false) - redirect_back_or_default dmsf_path(id: @project, folder_id: @folder) + redirect_back_or_default dmsf_folder_path(id: @project.id, folder_id: @folder) elsif params[:destroy_entries].present? delete_entries(selected_folders, selected_files, selected_dir_links, selected_file_links, selected_url_links, true) - redirect_back_or_default dmsf_path(id: @project, folder_id: @folder) + redirect_back_or_default dmsf_folder_path(id: @project.id, folder_id: @folder) else download_entries(selected_folders, selected_files) end @@ -199,7 +199,7 @@ class DmsfController < ApplicationController return redirect_to dmsf_folder_path id: @project, folder_id: @folder, custom_field_id: key, custom_value: value end end - redirect_back_or_default dmsf_path(id: @project, folder_id: @folder) + redirect_back_or_default dmsf_folder_path(id: @project.id, folder_id: @folder) end def entries_email @@ -294,7 +294,7 @@ class DmsfController < ApplicationController respond_to do |format| format.html do if commit - redirect_back_or_default dmsf_path(id: @project, folder_id: @folder) + redirect_back_or_default dmsf_folder_path(id: @project.id, folder_id: @folder) else redirect_to dmsf_folder_path(id: @project, folder_id: @parent) end @@ -339,7 +339,7 @@ class DmsfController < ApplicationController end flash[:notice] = l(:notice_folder_notifications_activated) end - redirect_back_or_default dmsf_path(id: @project, folder_id: @folder) + redirect_back_or_default dmsf_folder_path(id: @project.id, folder_id: @folder) end def notify_deactivate @@ -354,7 +354,7 @@ class DmsfController < ApplicationController end flash[:notice] = l(:notice_folder_notifications_deactivated) end - redirect_back_or_default dmsf_path(id: @project, folder_id: @folder) + redirect_back_or_default dmsf_folder_path(id: @project.id, folder_id: @folder) end def lock @@ -366,7 +366,7 @@ class DmsfController < ApplicationController @folder.lock! flash[:notice] = l(:notice_folder_locked) end - redirect_back_or_default dmsf_path(id: @project, folder_id: @folder) + redirect_back_or_default dmsf_folder_path(id: @project.id, folder_id: @folder) end def unlock @@ -382,7 +382,7 @@ class DmsfController < ApplicationController flash[:error] = l(:error_only_user_that_locked_folder_can_unlock_it) end end - redirect_back_or_default dmsf_path(id: @project, folder_id: @folder) + redirect_back_or_default dmsf_folder_path(id: @project.id, folder_id: @folder) end def add_email @@ -472,7 +472,7 @@ class DmsfController < ApplicationController link&.delete true end end - redirect_back_or_default_or_default trash_dmsf_path(id: @project.id) + redirect_back_or_default trash_dmsf_path(id: @project.id) end private diff --git a/app/controllers/dmsf_files_controller.rb b/app/controllers/dmsf_files_controller.rb index c181fdea..28e437fd 100644 --- a/app/controllers/dmsf_files_controller.rb +++ b/app/controllers/dmsf_files_controller.rb @@ -158,7 +158,7 @@ class DmsfFilesController < ApplicationController Rails.logger.error e.message flash[:error] = e.message revision.destroy - redirect_back_or_default dmsf_path(id: @project, folder_id: @folder) + redirect_back_or_default dmsf_folder_path(id: @project.id, folder_id: @folder) return end end @@ -194,7 +194,7 @@ class DmsfFilesController < ApplicationController end end end - redirect_back_or_default dmsf_path(id: @project, folder_id: @folder) + redirect_back_or_default dmsf_folder_path(id: @project.id, folder_id: @folder) end def delete @@ -268,7 +268,7 @@ class DmsfFilesController < ApplicationController flash[:error] = e.message end end - redirect_back_or_default dmsf_path(id: @project, folder_id: @folder) + redirect_back_or_default dmsf_folder_path(id: @project.id, folder_id: @folder) end def unlock @@ -286,7 +286,7 @@ class DmsfFilesController < ApplicationController flash[:error] = l(:error_only_user_that_locked_file_can_unlock_it) end end - redirect_back_or_default dmsf_path(id: @project, folder_id: @folder) + redirect_back_or_default dmsf_folder_path(id: @project.id, folder_id: @folder) end def notify_activate @@ -296,7 +296,7 @@ class DmsfFilesController < ApplicationController @file.notify_activate flash[:notice] = l(:notice_file_notifications_activated) end - redirect_back_or_default dmsf_path(id: @project, folder_id: @folder) + redirect_back_or_default dmsf_folder_path(id: @project.id, folder_id: @folder) end def notify_deactivate @@ -306,7 +306,7 @@ class DmsfFilesController < ApplicationController @file.notify_deactivate flash[:notice] = l(:notice_file_notifications_deactivated) end - redirect_back_or_default dmsf_path(id: @project, folder_id: @folder) + redirect_back_or_default dmsf_folder_path(id: @project.id, folder_id: @folder) end def restore @@ -315,7 +315,7 @@ class DmsfFilesController < ApplicationController else flash[:error] = @file.errors.full_messages.to_sentence end - redirect_back_or_default dmsf_path(id: @project, folder_id: @folder) + redirect_back_or_default dmsf_folder_path(id: @project.id, folder_id: @folder) end def thumbnail diff --git a/app/controllers/dmsf_folders_copy_controller.rb b/app/controllers/dmsf_folders_copy_controller.rb index 7901dd63..a4d66b98 100644 --- a/app/controllers/dmsf_folders_copy_controller.rb +++ b/app/controllers/dmsf_folders_copy_controller.rb @@ -43,7 +43,7 @@ class DmsfFoldersCopyController < ApplicationController redirect_to dmsf_folder_path(id: @target_project, folder_id: new_folder) else flash[:error] = new_folder.errors.full_messages.to_sentence - redirect_back_or_default dmsf_path(id: @project, folder_id: @folder) + redirect_back_or_default dmsf_folder_path(id: @project.id, folder_id: @folder) end end @@ -53,7 +53,7 @@ class DmsfFoldersCopyController < ApplicationController redirect_to dmsf_folder_path(id: @target_project, folder_id: @folder) else flash[:error] = @folder.errors.full_messages.to_sentence - redirect_back_or_default dmsf_path(id: @project, folder_id: @folder) + redirect_back_or_default dmsf_folder_path(id: @project.id, folder_id: @folder) end end diff --git a/app/controllers/dmsf_links_controller.rb b/app/controllers/dmsf_links_controller.rb index ce784df5..8ea31dd1 100644 --- a/app/controllers/dmsf_links_controller.rb +++ b/app/controllers/dmsf_links_controller.rb @@ -187,7 +187,7 @@ class DmsfLinksController < ApplicationController if @dmsf_link.restore flash[:notice] = l(:notice_dmsf_link_restored) end - redirect_back_or_default dmsf_path(id: @project, folder_id: @folder) + redirect_back_or_default dmsf_folder_path(id: @project.id, folder_id: @folder) end private diff --git a/app/controllers/dmsf_workflows_controller.rb b/app/controllers/dmsf_workflows_controller.rb index cc385b20..eb7840c7 100644 --- a/app/controllers/dmsf_workflows_controller.rb +++ b/app/controllers/dmsf_workflows_controller.rb @@ -180,7 +180,7 @@ class DmsfWorkflowsController < ApplicationController end end end - redirect_back_or_default dmsf_path(id: @project, folder_id: @folder) + redirect_back_or_default dmsf_folder_path(id: @project.id, folder_id: @folder) end def assign @@ -215,7 +215,7 @@ class DmsfWorkflowsController < ApplicationController rescue => e flash[:error] = e.message end - redirect_back_or_default dmsf_path(id: @project, folder_id: @folder) + redirect_back_or_default dmsf_folder_path(id: @project.id, folder_id: @folder) return # DMS link (attached) elsif params[:dmsf_link_id].present? @@ -227,7 +227,7 @@ class DmsfWorkflowsController < ApplicationController @dmsf_workflow_id = params[:dmsf_workflow_id] end else - redirect_back_or_default dmsf_path(id: @project, folder_id: @folder) + redirect_back_or_default dmsf_folder_path(id: @project.id, folder_id: @folder) return end respond_to do |format| @@ -394,7 +394,7 @@ class DmsfWorkflowsController < ApplicationController end end end - redirect_back_or_default dmsf_path(id: @project, folder_id: @folder) + redirect_back_or_default dmsf_folder_path(id: @project.id, folder_id: @folder) end def reorder_steps @@ -422,7 +422,7 @@ class DmsfWorkflowsController < ApplicationController flash[:error] = l(:notice_cannot_start_workflow) end end - redirect_back_or_default dmsf_path(id: @project, folder_id: @folder) + redirect_back_or_default dmsf_folder_path(id: @project.id, folder_id: @folder) end def update_step diff --git a/test/functional/dmsf_workflow_controller_test.rb b/test/functional/dmsf_workflow_controller_test.rb index 4fed3506..78e5b7be 100644 --- a/test/functional/dmsf_workflow_controller_test.rb +++ b/test/functional/dmsf_workflow_controller_test.rb @@ -39,7 +39,7 @@ class DmsfWorkflowsControllerTest < RedmineDmsf::Test::TestCase @wfsa2 = DmsfWorkflowStepAssignment.find 2 @revision1 = DmsfFileRevision.find 1 @revision2 = DmsfFileRevision.find 2 - @request.env['HTTP_REFERER'] = dmsf_folder_path(id: @project1.id) + @request.env['HTTP_REFERER'] = dmsf_folder_path(id: @project1) @request.session[:user_id] = @jsmith.id end