Prevent recursion while copying folders
This commit is contained in:
parent
d7861da913
commit
98938d8f2b
@ -205,7 +205,7 @@ class DmsfFolder < ActiveRecord::Base
|
||||
def self.directory_tree(project, current_folder = nil)
|
||||
tree = [[l(:link_documents), nil]]
|
||||
project_id = (project.is_a?(Project)) ? project.id : project
|
||||
folders = DmsfFolder.where(project_id: project_id).visible(false).to_a
|
||||
folders = DmsfFolder.where(project_id: project_id, dmsf_folder_id: nil).visible(false).to_a
|
||||
folders.delete(current_folder)
|
||||
folders = folders.delete_if{ |f| f.locked_for_user? }
|
||||
folders.each do |folder|
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user