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

#1132 Missing sub-folders

Browse Source
This commit is contained in:
Karel Pičman 2023-09-14 13:59:59 +02:00
parent eeefbafc04
commit 8b41216517
2 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/dmsf_controller.rb
View File

@ -146,7 +146,7 @@ class DmsfController < ApplicationController
@fast_links = member&.dmsf_fast_links
unless @fast_links
@projects = DmsfFolder.allowed_target_projects_on_copy
@folders = DmsfFolder.directory_tree(@target_project, @folder)
@folders = DmsfFolder.directory_tree(@target_project)
@target_folder = DmsfFolder.visible.find(params[:target_folder_id]) if params[:target_folder_id].present?
end
@back_url = params[:back_url]

15
app/models/dmsf_folder.rb
View File

@ -234,23 +234,21 @@ class DmsfFolder < ApplicationRecord
save!
end
def self.directory_tree(project, current_folder = nil)
def self.directory_tree(project)
tree = [[l(:link_documents), nil]]
project = Project.find(project) unless project.is_a?(Project)
folders = project.dmsf_folders.visible.to_a
# TODO: This prevents copying folders into its sub-folders too. It should be allowed.
folders.delete current_folder
folders.delete_if(&:locked_for_user?)
folders.each do |folder|
tree.push ["...#{folder.title}", folder.id]
DmsfFolder.directory_subtree tree, folder, 2, current_folder
DmsfFolder.directory_subtree tree, folder, 2
end
tree
end
def folder_tree
tree = [[title, id]]
DmsfFolder.directory_subtree tree, self, 1, nil
DmsfFolder.directory_subtree tree, self, 1
tree
end
@ -610,15 +608,12 @@ class DmsfFolder < ApplicationRecord
end
class << self
def directory_subtree(tree, folder, level, current_folder)
def directory_subtree(tree, folder, level)
folders = folder.dmsf_folders.visible.to_a
folders.delete current_folder
folders.delete_if(&:locked_for_user?)
folders.each do |subfolder|
unless subfolder == current_folder
tree.push ["#{'...' * level}#{subfolder.title}", subfolder.id]
DmsfFolder.directory_subtree tree, subfolder, level + 1, current_folder
end
DmsfFolder.directory_subtree tree, subfolder, level + 1
end
end
end