diff --git a/app/assets/javascripts/projects/index.js b/app/assets/javascripts/projects/index.js index 442ddec00..d4506a3dd 100644 --- a/app/assets/javascripts/projects/index.js +++ b/app/assets/javascripts/projects/index.js @@ -539,7 +539,7 @@ folders = selectedProjectFolders.map(e => ({ id: e, type: 'project_folder' })); let movables = projects.concat(folders); - $.get(url, { items: items }, function(result) { + $.get(url, { items: items, sort: projectsCurrentSort, mode: $('.projects-index').data('mode') }, function(result) { $(moveToModal).find('.modal-content').html(result.html); $(moveToModal).modal('show'); initializeJSTree($(moveToModal).find('#moveToFolders')); diff --git a/app/controllers/project_folders_controller.rb b/app/controllers/project_folders_controller.rb index 4cd9ad474..b138e6b0e 100644 --- a/app/controllers/project_folders_controller.rb +++ b/app/controllers/project_folders_controller.rb @@ -64,6 +64,10 @@ class ProjectFoldersController < ApplicationController end def move_to_modal + view_state = current_team.current_view_state(current_user) + @current_view_mode = params[:mode] || :active + @current_sort = view_state.state.dig('projects', @current_view_mode.to_s, 'sort') || 'atoz' + render json: { html: render_to_string(partial: 'projects/index/modals/move_to_modal_contents.html.erb', locals: { items_label: items_label(params[:items]) }) diff --git a/app/views/projects/index/modals/_move_to_modal_contents.html.erb b/app/views/projects/index/modals/_move_to_modal_contents.html.erb index c8c3df6be..cd4cda2e2 100644 --- a/app/views/projects/index/modals/_move_to_modal_contents.html.erb +++ b/app/views/projects/index/modals/_move_to_modal_contents.html.erb @@ -20,7 +20,7 @@