From 487d3e18f43b5024c83b722f4a6087f7a85a4d96 Mon Sep 17 00:00:00 2001 From: zmagod Date: Wed, 7 Sep 2016 07:55:45 +0200 Subject: [PATCH 1/5] fixed moved experiment thumbnail [fixes SCI-410] --- app/models/experiment.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/models/experiment.rb b/app/models/experiment.rb index 5723fdea1..79189f592 100644 --- a/app/models/experiment.rb +++ b/app/models/experiment.rb @@ -377,6 +377,7 @@ class Experiment < ActiveRecord::Base end save + touch(:workflowimg_updated_at) end # Get projects where user is either owner or user in the same organization From 29a2904513ea4d83c57cafae1f9ec42db48bb9f1 Mon Sep 17 00:00:00 2001 From: zmagod Date: Tue, 13 Sep 2016 14:51:53 +0200 Subject: [PATCH 2/5] fixed moving action of workflows and tasks --- app/models/experiment.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/models/experiment.rb b/app/models/experiment.rb index 79189f592..6a6e9d25a 100644 --- a/app/models/experiment.rb +++ b/app/models/experiment.rb @@ -500,6 +500,7 @@ class Experiment < ActiveRecord::Base end my_module.save! + experiment.delay.generate_workflow_img end end @@ -542,6 +543,7 @@ class Experiment < ActiveRecord::Base group.experiment = experiment group.save! + experiment.delay.generate_workflow_img end end end From d5c5c55bf2115e5052bb0e0153db094d38a5f140 Mon Sep 17 00:00:00 2001 From: zmagod Date: Tue, 13 Sep 2016 16:32:33 +0200 Subject: [PATCH 3/5] refactor --- app/models/experiment.rb | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/app/models/experiment.rb b/app/models/experiment.rb index 6a6e9d25a..2b24ee6fa 100644 --- a/app/models/experiment.rb +++ b/app/models/experiment.rb @@ -499,7 +499,12 @@ class Experiment < ActiveRecord::Base raise ActiveRecord::ActiveRecordError end - my_module.save! + my_module.save + end + + # Generate workflow image for the experiment in which we moved the task + to_move.each_value do |id| + experiment = Experiment.find_by_id(id) experiment.delay.generate_workflow_img end end @@ -543,9 +548,14 @@ class Experiment < ActiveRecord::Base group.experiment = experiment group.save! - experiment.delay.generate_workflow_img end end + + # Generate workflow image for the experiment in which we moved the workflow + to_move.each_value do |id| + experiment = Experiment.find_by_id(id) + experiment.delay.generate_workflow_img + end end # Update connections for all modules in this project. From d146970f6bf8b56b1123b1a628a62dcf95d4a776 Mon Sep 17 00:00:00 2001 From: zmagod Date: Thu, 15 Sep 2016 09:32:29 +0200 Subject: [PATCH 4/5] add generate workflow image method for moved modules --- app/models/experiment.rb | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/app/models/experiment.rb b/app/models/experiment.rb index 2b24ee6fa..f086662d3 100644 --- a/app/models/experiment.rb +++ b/app/models/experiment.rb @@ -503,10 +503,7 @@ class Experiment < ActiveRecord::Base end # Generate workflow image for the experiment in which we moved the task - to_move.each_value do |id| - experiment = Experiment.find_by_id(id) - experiment.delay.generate_workflow_img - end + generate_workflow_img_for_moved_modules(to_move) end # Move module groups; this method accepts a map where keys @@ -552,8 +549,19 @@ class Experiment < ActiveRecord::Base end # Generate workflow image for the experiment in which we moved the workflow + generate_workflow_img_for_moved_modules(to_move) + end + + # Generates workflow img when the workflow or module is moved + # to other experiment + def generate_workflow_img_for_moved_modules(to_move) + experiment_ids = [] to_move.each_value do |id| + experiment_ids << id + end + experiment_ids.uniq.each do |id| experiment = Experiment.find_by_id(id) + next unless experiment experiment.delay.generate_workflow_img end end From 779b7131481ff6ebfc4a796dcf3e2ab3c2f7bfbc Mon Sep 17 00:00:00 2001 From: zmagod Date: Thu, 15 Sep 2016 11:55:02 +0200 Subject: [PATCH 5/5] refactor code --- app/models/experiment.rb | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/app/models/experiment.rb b/app/models/experiment.rb index f086662d3..a90a5a6ac 100644 --- a/app/models/experiment.rb +++ b/app/models/experiment.rb @@ -555,11 +555,7 @@ class Experiment < ActiveRecord::Base # Generates workflow img when the workflow or module is moved # to other experiment def generate_workflow_img_for_moved_modules(to_move) - experiment_ids = [] - to_move.each_value do |id| - experiment_ids << id - end - experiment_ids.uniq.each do |id| + to_move.values.uniq.each do |id| experiment = Experiment.find_by_id(id) next unless experiment experiment.delay.generate_workflow_img