scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-20 23:16:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2831 from okriuchykhin/ok_SCI_4880_v2

Browse source 
Improve step reposition after deletion [SCI-4880]
This commit is contained in:
Alex Kriuchykhin 2020-09-08 13:13:27 +02:00 committed by GitHub
parent e3a90d41ad dd347aa834
commit a938db8271
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/models/protocol.rb
View file

@ -659,7 +659,7 @@ class Protocol < ApplicationRecord
def destroy_contents
# Calculate total space taken by the protocol
st = space_taken
steps.destroy_all
steps.order(position: :desc).destroy_all
# Release space taken by the step
team.release_space(st)

31
app/models/step.rb
View file

@ -140,7 +140,7 @@ class Step < ApplicationRecord
def move_in_protocol(direction)
transaction do
adjust_duplicated_step_positions
re_index_following_steps
case direction
when :up
@ -165,32 +165,23 @@ class Step < ApplicationRecord
end
def adjust_positions_after_destroy
adjust_duplicated_step_positions
protocol.steps.where('position > ?', position).find_each do |step|
re_index_following_steps
protocol.steps.where('position > ?', position).order(:position).each do |step|
step.update!(position: step.position - 1)
end
end
def adjust_duplicated_step_positions
duplicated_steps = protocol.steps.where(position: position)
return unless duplicated_steps.size > 1
# Shifting following steps
next_steps = protocol.steps.where(position: (position + 1)..).order(:position)
if next_steps.present?
shift_by = duplicated_steps.size - next_steps.first.position + position
if shift_by.positive?
next_steps.reverse_each do |step|
step.update!(position: step.position + shift_by)
end
end
def re_index_following_steps
steps = protocol.steps.where(position: position..).order(:position).where.not(id: id)
i = position
steps.each do |step|
i += 1
step.position = i
end
# Re-index duplicated positions
duplicated_steps.each_with_index do |step, i|
step.update!(position: step.position + i)
steps.reverse_each do |step|
step.save! if step.position_changed?
end
reload
end
def cascade_before_destroy