scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-09-16 01:54:34 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #6349 from ivanscinote/SCI-9430-move-result-does-not-work

Browse source 
Fix moving result elements bug [SCI-9430]
This commit is contained in:
Martin Artnik 2023-10-04 13:54:30 +02:00 • committed by GitHub
commit b3c2dd75cf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/controllers/result_elements/tables_controller.rb
View file

@ -65,7 +65,9 @@ module ResultElements
ActiveRecord::Base.transaction do
result_table.update!(result: target)
result_table.result_orderable_element.update!(result: target, position: target.result_orderable_elements.size)
result_table.result_orderable_element.destroy
new_orderable_element = target.result_orderable_elements.build(orderable: result_table)
new_orderable_element.insert_at(target.result_orderable_elements.count)
@result.normalize_elements_position
log_result_activity(

5
app/controllers/result_elements/texts_controller.rb
View file

@ -42,7 +42,9 @@ module ResultElements
ActiveRecord::Base.transaction do
@result_text.update!(result: target)
@result_text.result_orderable_element.update!(result: target, position: target.result_orderable_elements.size)
@result_text.result_orderable_element.destroy
new_orderable_element = target.result_orderable_elements.build(orderable: @result_text)
new_orderable_element.insert_at(target.result_orderable_elements.count)
@result.normalize_elements_position
render json: @result_text, serializer: ResultTextSerializer, user: current_user
@ -55,7 +57,6 @@ module ResultElements
result_destination: target.id
}
)
rescue ActiveRecord::RecordInvalid
render json: @result_text.errors, status: :unprocessable_entity
end

2
app/models/result_orderable_element.rb
View file

@ -8,7 +8,7 @@ class ResultOrderableElement < ApplicationRecord
belongs_to :result, inverse_of: :result_orderable_elements, touch: true
belongs_to :orderable, polymorphic: true, inverse_of: :result_orderable_element
acts_as_list scope: :result, top_of_list: 0, sequential_updates: true
acts_as_list scope: :result, top_of_list: 0, sequential_updates: false
private