IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-16 18:24:52 -06:00
Code Issues Packages Projects Releases Wiki Activity

FIX: clicking "show results" wasn't working after casting a vote

Browse Source
This commit is contained in:
Régis Hanol 2015-04-24 17:24:13 +02:00
parent eff921d1ec
commit 8129cce104
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/poll/assets/javascripts/controllers/poll.js.es6
View File

@ -77,9 +77,7 @@ export default Em.Controller.extend({
}.property("min", "max", "poll.options.length"),
canCastVotes: function() {
if (this.get("isClosed") ||
this.get("showingResults") ||
this.get("loading")) {
if (this.get("isClosed") || this.get("showingResults") || this.get("loading")) {
return false;
}
@ -137,7 +135,7 @@ export default Em.Controller.extend({
options: this.get("selectedOptions"),
}
}).then(function(results) {
self.setProperties({ vote: results.vote, showingResults: true });
self.setProperties({ vote: results.vote, showResults: true });
self.set("model", Em.Object.create(results.poll));
}).catch(function() {
bootbox.alert(I18n.t("poll.error_while_casting_votes"));

3
plugins/poll/assets/stylesheets/poll.scss
View File

@ -68,6 +68,8 @@ div.poll {
.results {
width: 100%;
.option {
max-width: 90%;
padding-right: 1.6em;
@ -88,7 +90,6 @@ div.poll {
.bar {
height: 10px;
background: $primary;
transition: all 0.25s;
}
}