Merge branch 'master' into glitch-soc/merge-upstream

2019-03-07 13:24:30 +01:00
parent 84c807a0dc 637c952ccb
commit 9c5e7805cc
4 changed files with 26 additions and 17 deletions
--- a/app/views/stream_entries/_poll.html.haml
+++ b/app/views/stream_entries/_poll.html.haml
@@ -7,7 +7,7 @@
    - options.each do |option|
      %li
        - if show_results
-          - percent = 100 * option.votes_count / poll.votes_count
+          - percent = poll.votes_count > 0 ? 100 * option.votes_count / poll.votes_count : 0
          %span.poll__chart{ style: "width: #{percent}%" }

          %label.poll__text><