github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-24 03:36:18 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: allows polls on closed topics

Browse Source
This commit is contained in:
Régis Hanol
2016-03-21 12:12:25 +01:00
parent e8aaa6d59e
commit b575f97ece
3 changed files with 12 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,12 +8,12 @@ export default Ember.Controller.extend({
// shows the results when
// - poll is closed
// - topic is archived/closed
// - topic is archived
// - user wants to see the results
showingResults: Em.computed.or("isClosed", "post.topic.closed", "post.topic.archived", "showResults"),
showingResults: Em.computed.or("isClosed", "post.topic.archived", "showResults"),
showResultsDisabled: Em.computed.equal("poll.voters", 0),
hideResultsDisabled: Em.computed.or("isClosed", "post.topic.closed", "post.topic.archived"),
hideResultsDisabled: Em.computed.or("isClosed", "post.topic.archived"),
@computed("model", "vote", "model.voters", "model.options", "model.status")
poll(poll, vote) {
@ -100,12 +100,11 @@ export default Ember.Controller.extend({
castVotesDisabled: Em.computed.not("canCastVotes"),
@computed("loading", "post.user_id", "post.topic.closed", "post.topic.archived")
canToggleStatus(loading, userId, topicClosed, topicArchived) {
@computed("loading", "post.user_id", "post.topic.archived")
canToggleStatus(loading, userId, topicArchived) {
return this.currentUser &&
(this.currentUser.get("id") === userId || this.currentUser.get("staff")) &&
!loading &&
!topicClosed &&
!topicArchived;
},