diff options
author | ThibG <thib@sitedethib.com> | 2019-03-28 15:12:33 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-03-28 15:12:33 +0100 |
commit | bb316faffff7a76bc89f7e942233f0e14caf60f5 (patch) | |
tree | 260458c7ff43dd82fc02cc7e5ef0920dd8d2a25b /app/helpers/stream_entries_helper.rb | |
parent | 0418bdd71f59b4d7e9f3498f2990c8b044f310e1 (diff) | |
parent | 050efbc12650feaac3e833c4dd740bf090e3dae1 (diff) |
Merge pull request #970 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/helpers/stream_entries_helper.rb')
-rw-r--r-- | app/helpers/stream_entries_helper.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/helpers/stream_entries_helper.rb b/app/helpers/stream_entries_helper.rb index 1e49e4fc6..5ad2c438e 100644 --- a/app/helpers/stream_entries_helper.rb +++ b/app/helpers/stream_entries_helper.rb @@ -111,8 +111,8 @@ module StreamEntriesHelper end def poll_summary(status) - return unless status.poll - status.poll.options.map { |o| "[ ] #{o}" }.join("\n") + return unless status.preloadable_poll + status.preloadable_poll.options.map { |o| "[ ] #{o}" }.join("\n") end def status_description(status) |