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

#1214 redirect_to :back is deprecated

Browse Source
This commit is contained in:
karel.picman@lbcfree.net 2021-02-26 11:44:45 +01:00
parent f4764fc50a
commit 6ea77c929d
7 changed files with 26 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
app/controllers/dmsf_controller.rb
View File

@ -147,7 +147,7 @@ class DmsfController < ApplicationController
selected_dir_links.blank? && selected_file_links.blank? &&
selected_url_links.blank?
flash[:warning] = l(:warning_no_entries_selected)
redirect_to :back
redirect_back fallback_location: dmsf_path(id: @project, folder_id: @folder)
return
end
@ -166,13 +166,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_to :back
redirect_back fallback_location: dmsf_path(id: @project, 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_to :back
redirect_back fallback_location: dmsf_path(id: @project, 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_to :back
redirect_back fallback_location: dmsf_path(id: @project, folder_id: @folder)
else
download_entries(selected_folders, selected_files)
end
@ -194,7 +194,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_to :back
redirect_back fallback_location: dmsf_path(id: @project, folder_id: @folder)
end
def entries_email
@ -289,7 +289,7 @@ class DmsfController < ApplicationController
respond_to do |format|
format.html do
if commit
redirect_to :back
redirect_back fallback_location: dmsf_path(id: @project, folder_id: @folder)
else
redirect_to dmsf_folder_path(id: @project, folder_id: @parent)
end
@ -334,7 +334,7 @@ class DmsfController < ApplicationController
end
flash[:notice] = l(:notice_folder_notifications_activated)
end
redirect_to :back
redirect_back fallback_location: dmsf_path(id: @project, folder_id: @folder)
end
def notify_deactivate
@ -349,7 +349,7 @@ class DmsfController < ApplicationController
end
flash[:notice] = l(:notice_folder_notifications_deactivated)
end
redirect_to :back
redirect_back fallback_location: dmsf_path(id: @project, folder_id: @folder)
end
def lock
@ -361,7 +361,7 @@ class DmsfController < ApplicationController
@folder.lock!
flash[:notice] = l(:notice_folder_locked)
end
redirect_to :back
redirect_back fallback_location: dmsf_path(id: @project, folder_id: @folder)
end
def unlock
@ -377,7 +377,7 @@ class DmsfController < ApplicationController
flash[:error] = l(:error_only_user_that_locked_folder_can_unlock_it)
end
end
redirect_to :back
redirect_back fallback_location: dmsf_path(id: @project, folder_id: @folder)
end
def add_email

14
app/controllers/dmsf_files_controller.rb
View File

@ -158,7 +158,7 @@ class DmsfFilesController < ApplicationController
Rails.logger.error e.message
flash[:error] = e.message
revision.destroy
redirect_to :back
redirect_back fallback_location: dmsf_path(id: @project, folder_id: @folder)
return
end
end
@ -194,7 +194,7 @@ class DmsfFilesController < ApplicationController
end
end
end
redirect_to :back
redirect_back fallback_location: dmsf_path(id: @project, folder_id: @folder)
end
def delete
@ -268,7 +268,7 @@ class DmsfFilesController < ApplicationController
flash[:error] = e.message
end
end
redirect_to :back
redirect_back fallback_location: dmsf_path(id: @project, 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_to :back
redirect_back fallback_location: dmsf_path(id: @project, 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_to :back
redirect_back fallback_location: dmsf_path(id: @project, 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_to :back
redirect_back fallback_location: dmsf_path(id: @project, folder_id: @folder)
end
def restore
@ -315,7 +315,7 @@ class DmsfFilesController < ApplicationController
else
flash[:error] = @file.errors.full_messages.to_sentence
end
redirect_to :back
redirect_back fallback_location: dmsf_path(id: @project, folder_id: @folder)
end
def thumbnail

4
app/controllers/dmsf_folders_copy_controller.rb
View File

@ -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_to :back
redirect_back fallback_location: dmsf_path(id: @project, 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_to :back
redirect_back fallback_location: dmsf_path(id: @project, folder_id: @folder)
end
end

2
app/controllers/dmsf_links_controller.rb
View File

@ -187,7 +187,7 @@ class DmsfLinksController < ApplicationController
if @dmsf_link.restore
flash[:notice] = l(:notice_dmsf_link_restored)
end
redirect_to :back
redirect_back fallback_location: dmsf_path(id: @project, folder_id: @folder)
end
private

10
app/controllers/dmsf_workflows_controller.rb
View File

@ -180,7 +180,7 @@ class DmsfWorkflowsController < ApplicationController
end
end
end
redirect_to :back
redirect_back fallback_location: dmsf_path(id: @project, folder_id: @folder)
end
def assign
@ -215,7 +215,7 @@ class DmsfWorkflowsController < ApplicationController
rescue => e
flash[:error] = e.message
end
redirect_to :back
redirect_back fallback_location: dmsf_path(id: @project, 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_to :back
redirect_back fallback_location: dmsf_path(id: @project, folder_id: @folder)
return
end
respond_to do |format|
@ -394,7 +394,7 @@ class DmsfWorkflowsController < ApplicationController
end
end
end
redirect_to :back
redirect_back fallback_location: dmsf_path(id: @project, folder_id: @folder)
end
def reorder_steps
@ -422,7 +422,7 @@ class DmsfWorkflowsController < ApplicationController
flash[:error] = l(:notice_cannot_start_workflow)
end
end
redirect_to :back
redirect_back fallback_location: dmsf_path(id: @project, folder_id: @folder)
end
def update_step

2
test/functional/projects_controller_test.rb
View File

@ -24,7 +24,7 @@ require File.expand_path('../../test_helper', __FILE__)
class ProjectsControllerTest < RedmineDmsf::Test::TestCase
include Redmine::I18n
def test_settings_dms_member
@request.session[:user_id] = @jsmith.id
@role_manager.add_permission! :user_preferences

1
test/integration/webdav/dmsf_webdav_delete_test.rb
View File

@ -70,7 +70,6 @@ class DmsfWebdavDeleteTest < RedmineDmsf::Test::IntegrationTest
def test_delete_when_ro
with_settings plugin_redmine_dmsf: {'dmsf_webdav_strategy' => 'WEBDAV_READ_ONLY', 'dmsf_webdav' => '1'} do
puts Setting.plugin_redmine_dmsf['dmsf_webdav_strategy']
delete "/dmsf/webdav/#{@project1.identifier}/#{@file1.name}", params: nil, headers: @admin
assert_response :bad_gateway # WebDAV is read only
end