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

Merge branch 'master' into devel-2.0.1

Browse Source
This commit is contained in:
Karel Pičman 2019-05-24 10:08:35 +02:00
commit dd6ff1cdce
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/dmsf_folder.rb
View File

@ -205,7 +205,7 @@ class DmsfFolder < ActiveRecord::Base
def self.directory_tree(project, current_folder = nil) def self.directory_tree(project, current_folder = nil)
tree = [[l(:link_documents), nil]] tree = [[l(:link_documents), nil]]
project_id = (project.is_a?(Project)) ? project.id : project 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.delete(current_folder)
folders = folders.delete_if{ |f| f.locked_for_user? } folders = folders.delete_if{ |f| f.locked_for_user? }
folders.each do |folder| folders.each do |folder|