Merge branch 'master' into devel-2.0.0

app/controllers/dmsf_context_menus_controller.rb

@@ -54,7 +54,7 @@ class DmsfContextMenusController < ApplicationController
       selected_files = params[:ids].select{ |x| x =~ /file-\d+/ }.map{ |x| $1.to_i if x =~ /file-(\d+)/ }
       selected_file_links = params[:ids].select{ |x| x =~ /file-link-\d+/ }.map{ |x| $1.to_i if x =~ /file-link-(\d+)/ }
       selected_file_links.each do |id|
-        target_id = DmsfLink.find_by(id: id).pluck(:target_id).first
+        target_id = DmsfLink.where(id: id).pluck(:target_id).first
         selected_files << target_id if target_id && !selected_files.include?(target_id)
       end
       if (selected_files.size == 1) && (params[:ids].size == 1)

app/models/dmsf_folder.rb

@@ -202,7 +202,8 @@ class DmsfFolder < ActiveRecord::Base
 
   def self.directory_tree(project, current_folder = nil)
     tree = [[l(:link_documents), nil]]
-    folders = DmsfFolder.where(project_id: project.id).visible(false).to_a
+    project_id = (project.is_a?(Project)) ? project.id : project
+    folders = DmsfFolder.where(project_id: project_id).visible(false).to_a
     folders.delete(current_folder)
     folders = folders.delete_if{ |f| f.locked_for_user? }
     folders.each do |folder|

test/unit/dmsf_folder_test.rb

@@ -161,6 +161,18 @@ class DmsfFolderTest < RedmineDmsf::Test::UnitTest
     assert !tree.to_s.include?('......folder2'), "'......folder2' string in the folder tree not expected."
   end
 
+  def test_directory_tree_id
+    tree = DmsfFolder.directory_tree(@project.id)
+    assert tree
+    # [["Documents", nil],
+    #  ["...folder7", 7],
+    #  ["...folder1", 1],
+    #  ["......folder2", 2] - locked
+    #  ["...folder6", 6]]
+    assert tree.to_s.include?('...folder1'), "'...folder3' string in the folder tree expected."
+    assert !tree.to_s.include?('......folder2'), "'......folder2' string in the folder tree not expected."
+  end
+
   def test_folder_tree
     tree = @folder1.folder_tree
     assert tree