diff --git a/app/controllers/dmsf_controller.rb b/app/controllers/dmsf_controller.rb index f6b74980..be6033d7 100644 --- a/app/controllers/dmsf_controller.rb +++ b/app/controllers/dmsf_controller.rb @@ -183,12 +183,12 @@ class DmsfController < ApplicationController elsif params[:destroy_entries].present? delete_entries @selected_folders, @selected_files, @selected_links, true redirect_back_or_default dmsf_folder_path(id: @project, folder_id: @folder) - elsif params[:move_entries].present? - move_entries @selected_folders, @selected_files, @selected_links - redirect_back_or_default dmsf_folder_path(id: @project, folder_id: @folder) elsif params[:copy_entries].present? copy_entries @selected_folders, @selected_files, @selected_links redirect_back_or_default dmsf_folder_path(id: @project, folder_id: @folder) + elsif params[:move_entries].present? + move_entries @selected_folders, @selected_files, @selected_links + redirect_back_or_default dmsf_folder_path(id: @project, folder_id: @folder) else download_entries @selected_folders, @selected_files end diff --git a/app/views/dmsf/copymove.html.erb b/app/views/dmsf/copymove.html.erb index e6a975f3..962e1c0e 100644 --- a/app/views/dmsf/copymove.html.erb +++ b/app/views/dmsf/copymove.html.erb @@ -28,6 +28,7 @@ <%= hidden_field_tag 'back_url', @back_url %> <%= hidden_field_tag 'id', @project %> <%= hidden_field_tag 'copy_entries', true %> + <%= hidden_field_tag 'move_entries', true %>
<% unless @fast_links %>

@@ -58,8 +59,7 @@ <%= late_javascript_tag do %> $('#move_button').click(function(event) { - $('#copyForm').attr('action', "<%= entries_operations_dmsf_path(ids: @ids, move_entries: true) %>"); - $('#copyForm').submit(); + $('input#copy_entries').remove() }); <% unless @fast_links %> $('#dmsf_entries_target_project_id').change(function () {