From 97371f8216b8b4223556eba7f0d0300b67c56c69 Mon Sep 17 00:00:00 2001 From: Urban Rotnik Date: Fri, 15 Jan 2021 11:33:35 +0100 Subject: [PATCH] Reorder ProjectFolder inner foldres --- app/helpers/project_folders_helper.rb | 15 +++++++++++++++ app/views/projects/index/_breadcrumbs.html.erb | 2 +- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/app/helpers/project_folders_helper.rb b/app/helpers/project_folders_helper.rb index 17070e47a..04c220047 100644 --- a/app/helpers/project_folders_helper.rb +++ b/app/helpers/project_folders_helper.rb @@ -10,4 +10,19 @@ module ProjectFoldersHelper I18n.t('projects.index.modal_move_folder.items.projects_and_folders') end end + + def tree_ordered_parent_folders(current_folder) + folders = current_folder&.parent_folders + return unless folders + + ordered_folders = [current_folder] + folders.each do + folder = folders.find { |f| f.id == ordered_folders.last.parent_folder_id } + break unless folder + + ordered_folders << folder + end + + ordered_folders.reverse + end end diff --git a/app/views/projects/index/_breadcrumbs.html.erb b/app/views/projects/index/_breadcrumbs.html.erb index bd917358a..3181d6f05 100644 --- a/app/views/projects/index/_breadcrumbs.html.erb +++ b/app/views/projects/index/_breadcrumbs.html.erb @@ -6,7 +6,7 @@ data: { projects_cards_url: cards_projects_url, sidebar_url: sidebar_team_path(current_team) }) %> / - <% target_folder&.parent_folders&.each do |project_folder| %> + <% tree_ordered_parent_folders(target_folder)&.each do |project_folder| %> <%= link_to(project_folder.name, project_folder_path(project_folder), class: 'project-folder-link',