diff options
author | Claire <claire.github-309c@sitedethib.com> | 2022-05-26 18:52:59 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-05-26 18:52:59 +0200 |
commit | a33a0f69523298520704b98d4dc7fdd1accae642 (patch) | |
tree | 6e373aa9ced74f68ee366cc50e23d14a524c36f9 /app/models/poll.rb | |
parent | 444b65009411a08ddab95ec60b86b3cf63086c2e (diff) | |
parent | f13d910f3ea3af1e6b5ff2ebfa084a86b1d7dfde (diff) |
Merge pull request #1784 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/models/poll.rb')
-rw-r--r-- | app/models/poll.rb | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/app/models/poll.rb b/app/models/poll.rb index ba08309a1..1a326e452 100644 --- a/app/models/poll.rb +++ b/app/models/poll.rb @@ -39,13 +39,12 @@ class Poll < ApplicationRecord before_validation :prepare_options, if: :local? before_validation :prepare_votes_count - - after_initialize :prepare_cached_tallies + before_validation :prepare_cached_tallies after_commit :reset_parent_cache, on: :update def loaded_options - options.map.with_index { |title, key| Option.new(self, key.to_s, title, show_totals_now? ? cached_tallies[key] : nil) } + options.map.with_index { |title, key| Option.new(self, key.to_s, title, show_totals_now? ? (cached_tallies[key] || 0) : nil) } end def possibly_stale? |