Fix poll votes not being properly reset on poll change (#17498)
* Fix poll votes not being properly reset on poll change * Fix and add tests * Fix poll update handling when the number of options changes
This commit is contained in:
parent
1bfcb75105
commit
63854bee6c
4 changed files with 25 additions and 13 deletions
|
@ -73,15 +73,13 @@ class UpdateStatusService < BaseService
|
|||
|
||||
# If for some reasons the options were changed, it invalidates all previous
|
||||
# votes, so we need to remove them
|
||||
if @options[:poll][:options] != poll.options || ActiveModel::Type::Boolean.new.cast(@options[:poll][:multiple]) != poll.multiple
|
||||
@poll_changed = true
|
||||
poll.votes.delete_all unless poll.new_record?
|
||||
end
|
||||
@poll_changed = true if @options[:poll][:options] != poll.options || ActiveModel::Type::Boolean.new.cast(@options[:poll][:multiple]) != poll.multiple
|
||||
|
||||
poll.options = @options[:poll][:options]
|
||||
poll.hide_totals = @options[:poll][:hide_totals] || false
|
||||
poll.multiple = @options[:poll][:multiple] || false
|
||||
poll.expires_in = @options[:poll][:expires_in]
|
||||
poll.reset_votes! if @poll_changed
|
||||
poll.save!
|
||||
|
||||
@status.poll_id = poll.id
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue