From 427775f2992e9e69d1e0b66f29589c8a2a5e3c14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Pi=C4=8Dman?= Date: Thu, 23 Apr 2020 10:35:30 +0200 Subject: [PATCH] Status 404 after moving the folder to another project #1106 --- app/models/dmsf_folder.rb | 8 -------- test/unit/dmsf_folder_test.rb | 2 +- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/app/models/dmsf_folder.rb b/app/models/dmsf_folder.rb index 4efb59ae..f1451147 100644 --- a/app/models/dmsf_folder.rb +++ b/app/models/dmsf_folder.rb @@ -127,14 +127,6 @@ class DmsfFolder < ActiveRecord::Base end end - def self.find_by_title(project, folder, title) - if folder - visible.find_by(project_id: project.id, dmsf_folder_id: nil, title: title) - else - visible.find_by(project_id: project.id, dmsf_folder_id: folder.id, title: title) - end - end - def delete(commit) if locked? errors[:base] << l(:error_folder_is_locked) diff --git a/test/unit/dmsf_folder_test.rb b/test/unit/dmsf_folder_test.rb index 257373d4..6b77dfdf 100644 --- a/test/unit/dmsf_folder_test.rb +++ b/test/unit/dmsf_folder_test.rb @@ -212,7 +212,7 @@ class DmsfFolderTest < RedmineDmsf::Test::UnitTest def test_copy_to assert @folder1.copy_to(@project2, nil) - assert DmsfFolder.find_by_title(@project2, nil, @folder1.title) + assert DmsfFolder.find_by(project_id: @project2.id, title: @folder1.title) end end \ No newline at end of file