From 231cdae3d9b6d5ebc71c6bc6789fc602de8af3ca Mon Sep 17 00:00:00 2001 From: lyollix Date: Wed, 9 Nov 2022 14:53:54 +0300 Subject: [PATCH 1/4] Update issues_controller_hooks.rb fix https://github.com/danmunn/redmine_dmsf/issues/1408 --- .../controllers/issues_controller_hooks.rb | 35 ++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-) diff --git a/lib/redmine_dmsf/hooks/controllers/issues_controller_hooks.rb b/lib/redmine_dmsf/hooks/controllers/issues_controller_hooks.rb index 1a96363c..5d9b3132 100644 --- a/lib/redmine_dmsf/hooks/controllers/issues_controller_hooks.rb +++ b/lib/redmine_dmsf/hooks/controllers/issues_controller_hooks.rb @@ -121,6 +121,39 @@ module RedmineDmsf Rails.logger.error dmsf_link.errors.full_messages.to_sentence end end + issue.descendants.each do |i| + old_system_folder = i.system_folder(false, old_project_id) + + if old_system_folder + new_main_system_folder = i.main_system_folder(true) + + if new_main_system_folder + old_system_folder.dmsf_folder_id = new_main_system_folder.id + old_system_folder.project_id = project_id + + 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_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 end end @@ -186,4 +219,4 @@ module RedmineDmsf end end -end \ No newline at end of file +end From 6769582f0d91f3ef6e2b97d91e10b6069702fb6d Mon Sep 17 00:00:00 2001 From: lyollix Date: Wed, 9 Nov 2022 15:07:21 +0300 Subject: [PATCH 2/4] Update issues_controller_hooks.rb fix https://github.com/danmunn/redmine_dmsf/issues/1408 --- .../hooks/controllers/issues_controller_hooks.rb | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/lib/redmine_dmsf/hooks/controllers/issues_controller_hooks.rb b/lib/redmine_dmsf/hooks/controllers/issues_controller_hooks.rb index 5d9b3132..e813af78 100644 --- a/lib/redmine_dmsf/hooks/controllers/issues_controller_hooks.rb +++ b/lib/redmine_dmsf/hooks/controllers/issues_controller_hooks.rb @@ -121,10 +121,12 @@ module RedmineDmsf Rails.logger.error dmsf_link.errors.full_messages.to_sentence end end - issue.descendants.each do |i| - old_system_folder = i.system_folder(false, old_project_id) + end + + issue.descendants.each do |i| + old_system_folder = i.system_folder(false, old_project_id) - if old_system_folder + if old_system_folder new_main_system_folder = i.main_system_folder(true) if new_main_system_folder @@ -154,7 +156,6 @@ module RedmineDmsf end end end - end end end end From 6e5e047dd106337e63b2467f37d267bfdf186f31 Mon Sep 17 00:00:00 2001 From: lyollix Date: Wed, 9 Nov 2022 15:13:06 +0300 Subject: [PATCH 3/4] Update issues_controller_hooks.rb --- .../hooks/controllers/issues_controller_hooks.rb | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/redmine_dmsf/hooks/controllers/issues_controller_hooks.rb b/lib/redmine_dmsf/hooks/controllers/issues_controller_hooks.rb index e813af78..472e153d 100644 --- a/lib/redmine_dmsf/hooks/controllers/issues_controller_hooks.rb +++ b/lib/redmine_dmsf/hooks/controllers/issues_controller_hooks.rb @@ -130,21 +130,21 @@ module RedmineDmsf new_main_system_folder = i.main_system_folder(true) if new_main_system_folder - old_system_folder.dmsf_folder_id = new_main_system_folder.id - old_system_folder.project_id = project_id + old_system_folder.dmsf_folder_id = new_main_system_folder.id + old_system_folder.project_id = project_id - unless old_system_folder.save + 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 + end - i.dmsf_files.each do |dmsf_file| + 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 + 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| From 4d3b44cc171ef8dde1e5728438a92e022578231e Mon Sep 17 00:00:00 2001 From: lyollix Date: Wed, 9 Nov 2022 15:19:28 +0300 Subject: [PATCH 4/4] 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