Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3421 from gschlager/poll 

FIX: closed polls with no votes showed NaN as percentage and average
This commit is contained in:
Régis Hanol 2015-05-03 19:50:29 +02:00
parent c9d72e8845 c9e4fd578d
commit 5df7a5b4e3
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
plugins/poll/assets/javascripts/components/poll-results-number.js.es6
View File

@ -12,7 +12,8 @@ export default Em.Component.extend({
}.property("poll.options.@each.{html,votes}"),
average: function() {
return round(this.get("totalScore") / this.get("poll.total_votes"), -2);
const total_votes = this.get("poll.total_votes");
return total_votes == 0 ? 0 : round(this.get("totalScore") / total_votes, -2);
}.property("totalScore", "poll.total_votes"),
averageRating: function() {

2
plugins/poll/assets/javascripts/components/poll-results-standard.js.es6
View File

@ -7,7 +7,7 @@ export default Em.Component.extend({
backgroundColor = this.get("poll.background");
this.get("poll.options").forEach(option => {
const percentage = Math.floor(100 * option.get("votes") / totalVotes),
const percentage = totalVotes == 0 ? 0 : Math.floor(100 * option.get("votes") / totalVotes),
styles = ["width: " + percentage + "%"];
if (backgroundColor) { styles.push("background: " + backgroundColor); }