Merge pull request #15952 from opf/bug/fix-warning-message

Fix type-reassignment warning message being shown in cases where it shouldn't
opf · Jun 25, 2024 · aad5774 · aad5774
2 parents c2463bb + 2a2900e
commit aad5774
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/app/controllers/work_packages/moves_controller.rb b/app/controllers/work_packages/moves_controller.rb
@@ -127,8 +127,10 @@ def set_unavailable_type_in_target_project
     if @target_project == @project
       false
     elsif @target_type.nil?
-      work_packages_and_descendants = WorkPackageHierarchy.where(ancestor_id: @work_packages.select(:id))
-      Type.where(id: work_packages_and_descendants.select(:id))
+      hierarchies = WorkPackageHierarchy
+                      .includes(:ancestor)
+                      .where(ancestor_id: @work_packages.select(:id))
+      Type.where(id: hierarchies.map { _1.ancestor.type_id })
           .select("distinct id")
           .pluck(:id)
           .difference(@types.pluck(:id))