From 44ac90f114c6c1e906b4b7f69188afd0a2bc4df3 Mon Sep 17 00:00:00 2001
From: "Karel.Picman" <karel.picman@kontron.com>
Date: Wed, 15 Dec 2021 13:55:05 +0100
Subject: [PATCH] Wrong links to a project #1317

---
 app/models/dmsf_query.rb                |  2 +-
 test/functional/dmsf_controller_test.rb | 18 ++++++++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/app/models/dmsf_query.rb b/app/models/dmsf_query.rb
index 01da73db..b2668b0b 100644
--- a/app/models/dmsf_query.rb
+++ b/app/models/dmsf_query.rb
@@ -314,7 +314,7 @@ class DmsfQuery < Query
     end
     scope = DmsfLink.select(%{
         dmsf_links.id AS id,
-        COALESCE(dmsf_folders.project_id, dmsf_links.project_id) AS project_id,
+        dmsf_links.target_project_id AS project_id,
         dmsf_links.target_id AS revision_id,
         dmsf_links.name AS title,
         dmsf_folders.title AS filename,
diff --git a/test/functional/dmsf_controller_test.rb b/test/functional/dmsf_controller_test.rb
index d691d9b5..f4fed32c 100644
--- a/test/functional/dmsf_controller_test.rb
+++ b/test/functional/dmsf_controller_test.rb
@@ -255,6 +255,24 @@ class DmsfControllerTest < RedmineDmsf::Test::TestCase
     assert_response :not_found
   end
 
+  def test_folder_link_to_folder
+    get :show, params: { id: @link1.project_id, folder_id: @link1.dmsf_folder_id }
+    assert_response :success
+    assert_select 'a', text: @link1.title, count: 1
+    assert_select 'a[href$=?]', "/projects/#{@link1.target_project.identifier}/dmsf?folder_id=#{@link1.target_folder.id}",
+                  count: 2 # Two because of folder1 and folder1_link
+  end
+
+  def test_folder_link_to_project
+    @link1.target_project_id = @project2.id
+    @link1.target_id = nil
+    assert @link1.save
+    get :show, params: { id: @link1.project_id, folder_id: @link1.dmsf_folder_id }
+    assert_response :success
+    assert_select 'a', text: @link1.title, count: 1
+    assert_select 'a[href$=?]', "/projects/#{@project2.identifier}/dmsf", count: 1
+  end
+
   def test_new_forbidden
     @role_manager.remove_permission! :folder_manipulation
     get :new, params: { id: @project1, parent_id: nil }