From 98938d8f2baa3874589367dfb17fc727c481bd78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Pi=C4=8Dman?= Date: Fri, 24 May 2019 09:19:48 +0200 Subject: [PATCH] Prevent recursion while copying folders --- app/models/dmsf_folder.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/dmsf_folder.rb b/app/models/dmsf_folder.rb index 016f49de..a21668c4 100644 --- a/app/models/dmsf_folder.rb +++ b/app/models/dmsf_folder.rb @@ -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|