From 4d3b44cc171ef8dde1e5728438a92e022578231e Mon Sep 17 00:00:00 2001 From: lyollix Date: Wed, 9 Nov 2022 15:19:28 +0300 Subject: [PATCH] Update issues_controller_hooks.rb --- .../controllers/issues_controller_hooks.rb | 50 +++++++++---------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/lib/redmine_dmsf/hooks/controllers/issues_controller_hooks.rb b/lib/redmine_dmsf/hooks/controllers/issues_controller_hooks.rb index 472e153d..1f009ad4 100644 --- a/lib/redmine_dmsf/hooks/controllers/issues_controller_hooks.rb +++ b/lib/redmine_dmsf/hooks/controllers/issues_controller_hooks.rb @@ -122,39 +122,39 @@ module RedmineDmsf end end end - - issue.descendants.each do |i| - old_system_folder = i.system_folder(false, old_project_id) + end - if old_system_folder - new_main_system_folder = i.main_system_folder(true) + issue.descendants.each do |i| + old_system_folder = i.system_folder(false, old_project_id) - if new_main_system_folder - old_system_folder.dmsf_folder_id = new_main_system_folder.id - old_system_folder.project_id = project_id + if old_system_folder + new_main_system_folder = i.main_system_folder(true) - unless old_system_folder.save - controller.flash[:error] = old_system_folder.errors.full_messages.to_sentence - Rails.logger.error old_system_folder.errors.full_messages.to_sentence - end + if new_main_system_folder + old_system_folder.dmsf_folder_id = new_main_system_folder.id + old_system_folder.project_id = project_id - i.dmsf_files.each do |dmsf_file| - dmsf_file.project_id = project_id - unless dmsf_file.save - controller.flash[:error] = dmsf_file.errors.full_messages.to_sentence - Rails.logger.error dmsf_file.errors.full_messages.to_sentence - end - end + unless old_system_folder.save + controller.flash[:error] = old_system_folder.errors.full_messages.to_sentence + Rails.logger.error old_system_folder.errors.full_messages.to_sentence end - i.dmsf_links.each do | dmsf_link| - dmsf_link.project_id = project_id - unless dmsf_link.save - controller.flash[:error] = dmsf_link.errors.full_messages.to_sentence - Rails.logger.error dmsf_link.errors.full_messages.to_sentence - end + i.dmsf_files.each do |dmsf_file| + dmsf_file.project_id = project_id + unless dmsf_file.save + controller.flash[:error] = dmsf_file.errors.full_messages.to_sentence + Rails.logger.error dmsf_file.errors.full_messages.to_sentence + end end end + + i.dmsf_links.each do | dmsf_link| + dmsf_link.project_id = project_id + unless dmsf_link.save + controller.flash[:error] = dmsf_link.errors.full_messages.to_sentence + Rails.logger.error dmsf_link.errors.full_messages.to_sentence + end + end end end end