scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-10-11 14:27:04 +08:00
Code Issues Projects Releases Packages Wiki Activity

Log activity for content reordering only when order change [SCI-10730]

Browse source
This commit is contained in:
Andrej 2024-06-17 12:52:48 +02:00
parent df5a414bf5
commit 873a70e425
3 changed files with 32 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/controllers/result_orderable_elements_controller.rb
View file

@ -5,15 +5,18 @@ class ResultOrderableElementsController < ApplicationController
before_action :check_manage_permissions before_action :check_manage_permissions
def reorder def reorder
position_changed = false
ActiveRecord::Base.transaction do ActiveRecord::Base.transaction do
params[:result_orderable_element_positions].each do |id, position| params[:result_orderable_element_positions].each do |id, position|
result_element = @result.result_orderable_elements.find(id) result_element = @result.result_orderable_elements.find(id)
result_element.insert_at(position) position_changed ||= result_element.insert_at(position)
end end
end end
if position_changed
log_activity(:result_content_rearranged, @my_module.experiment.project, my_module: @my_module.id) log_activity(:result_content_rearranged, @my_module.experiment.project, my_module: @my_module.id)
@result.touch @result.touch
end
render json: params[:result_orderable_element_positions], status: :ok render json: params[:result_orderable_element_positions], status: :ok
rescue ActiveRecord::RecordInvalid rescue ActiveRecord::RecordInvalid

9
app/controllers/step_orderable_elements_controller.rb
View file

@ -6,10 +6,16 @@ class StepOrderableElementsController < ApplicationController
def reorder def reorder
@step.with_lock do @step.with_lock do
position_changed = false
params[:step_orderable_element_positions].each do |id, position| params[:step_orderable_element_positions].each do |id, position|
@step.step_orderable_elements.find(id).update_column(:position, position) step_element = @step.step_orderable_elements.find(id)
if step_element.position != position
position_changed = true
step_element.update_column(:position, position)
end
end end
if position_changed
if @protocol.in_module? if @protocol.in_module?
log_activity(:task_step_content_rearranged, @my_module.experiment.project, my_module: @my_module.id) log_activity(:task_step_content_rearranged, @my_module.experiment.project, my_module: @my_module.id)
else else
@ -17,6 +23,7 @@ class StepOrderableElementsController < ApplicationController
end end
@step.touch @step.touch
end end
end
render json: params[:step_orderable_element_positions], status: :ok render json: params[:step_orderable_element_positions], status: :ok
end end

9
app/controllers/steps_controller.rb
View file

@ -241,10 +241,16 @@ class StepsController < ApplicationController
def reorder def reorder
@protocol.with_lock do @protocol.with_lock do
position_changed = false
params[:step_positions].each do |id, position| params[:step_positions].each do |id, position|
@protocol.steps.find(id).update_column(:position, position) step = @protocol.steps.find(id)
if position != step.position
position_changed = true
step.update_column(:position, position)
end
end end
if position_changed
if @protocol.in_module? if @protocol.in_module?
log_activity(:task_steps_rearranged, @my_module.experiment.project, my_module: @my_module.id) log_activity(:task_steps_rearranged, @my_module.experiment.project, my_module: @my_module.id)
else else
@ -252,6 +258,7 @@ class StepsController < ApplicationController
end end
@protocol.touch @protocol.touch
end end
end
render json: { render json: {
steps_order: @protocol.steps.order(:position).select(:id, :position) steps_order: @protocol.steps.order(:position).select(:id, :position)