diff options
| author | ThibG <thib@sitedethib.com> | 2019-03-08 01:47:36 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-08 01:47:36 +0100 |
| commit | 29a09858f6700c0a6eb17797836589ed0839dec9 (patch) | |
| tree | 96ac7fbac23d6ca32704c143342b5606523c8cab /app/views/stream_entries | |
| parent | 38e9c66f34d7054357a3de63834f182734d43d75 (diff) | |
| parent | ca45198ccbbdde88731f074fcab2b5c9310775c2 (diff) | |
Merge pull request #945 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/views/stream_entries')
| -rw-r--r-- | app/views/stream_entries/_poll.html.haml | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/app/views/stream_entries/_poll.html.haml b/app/views/stream_entries/_poll.html.haml index dad04b79c..d6b2c0cd9 100644 --- a/app/views/stream_entries/_poll.html.haml +++ b/app/views/stream_entries/_poll.html.haml @@ -1,10 +1,8 @@ -- options = (!poll.expired? && poll.hide_totals?) ? poll.unloaded_options : poll.loaded_options -- voted = user_signed_in? && poll.votes.where(account: current_account).exists? -- show_results = voted || poll.expired? +- show_results = (user_signed_in? && poll.voted?(current_account)) || poll.expired? .poll %ul - - options.each do |option| + - poll.loaded_options.each do |option| %li - if show_results - percent = poll.votes_count > 0 ? 100 * option.votes_count / poll.votes_count : 0 |