diff --git a/app/controllers/my_modules_controller.rb b/app/controllers/my_modules_controller.rb index a9e941cd2..b1ba1783a 100644 --- a/app/controllers/my_modules_controller.rb +++ b/app/controllers/my_modules_controller.rb @@ -373,6 +373,8 @@ class MyModulesController < ApplicationController def update_state old_status_id = @my_module.my_module_status_id + @my_module.my_module_status_created_by = current_user + if @my_module.update(my_module_status_id: update_status_params[:status_id]) log_activity(:change_status_on_task_flow, @my_module, my_module_status_old: old_status_id, my_module_status_new: @my_module.my_module_status.id) diff --git a/app/models/my_module.rb b/app/models/my_module.rb index 5ded2c691..a87cf771d 100644 --- a/app/models/my_module.rb +++ b/app/models/my_module.rb @@ -14,7 +14,7 @@ class MyModule < ApplicationRecord include Assignable include Cloneable - attr_accessor :transition_error_rollback + attr_accessor :transition_error_rollback, :my_module_status_created_by enum state: Extends::TASKS_STATES enum provisioning_status: { done: 0, in_progress: 1, failed: 2 } @@ -567,7 +567,7 @@ class MyModule < ApplicationRecord if status_changing_direction == :forward my_module_status.my_module_status_consequences.each do |consequence| - consequence.before_forward_call(self) + consequence.before_forward_call(self, my_module_status_created_by) end end diff --git a/app/models/my_module_status_consequence.rb b/app/models/my_module_status_consequence.rb index 6abce4dc8..4ca043266 100644 --- a/app/models/my_module_status_consequence.rb +++ b/app/models/my_module_status_consequence.rb @@ -7,7 +7,7 @@ class MyModuleStatusConsequence < ApplicationRecord def backward(my_module); end - def before_forward_call(my_module); end + def before_forward_call(my_module, user = nil); end def runs_in_background? false diff --git a/app/models/my_module_status_consequences/repository_snapshot.rb b/app/models/my_module_status_consequences/repository_snapshot.rb index e39f8efeb..50527dd6b 100644 --- a/app/models/my_module_status_consequences/repository_snapshot.rb +++ b/app/models/my_module_status_consequences/repository_snapshot.rb @@ -6,9 +6,9 @@ module MyModuleStatusConsequences true end - def before_forward_call(my_module) + def before_forward_call(my_module, created_by = nil) my_module.assigned_repositories.each do |repository| - ::RepositorySnapshot.create_preliminary!(repository, my_module) + ::RepositorySnapshot.create_preliminary!(repository, my_module, created_by) end end