github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-23 20:21:25 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

REFACTOR: use tables instead of custom fields for polls (#6359)

Browse Source 
Co-authored-by: Guo Xiang Tan <tgx_world@hotmail.com>
This commit is contained in:
Régis Hanol
2018-11-19 14:50:00 +01:00
committed by GitHub
parent 86dafc1f25
commit 4459665dee
37 changed files with 1912 additions and 1573 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
plugins/poll/assets/javascripts/controllers/poll-ui-builder.js.es6
View File

@ -9,6 +9,10 @@ export default Ember.Controller.extend({
numberPollType: "number",
multiplePollType: "multiple",
alwaysPollResult: "always",
votePollResult: "on_vote",
closedPollResult: "on_close",
init() {
this._super();
this._setupPoll();
@ -32,6 +36,24 @@ export default Ember.Controller.extend({
];
},
@computed("alwaysPollResult", "votePollResult", "closedPollResult")
pollResults(alwaysPollResult, votePollResult, closedPollResult) {
return [
{
name: I18n.t("poll.ui_builder.poll_result.always"),
value: alwaysPollResult
},
{
name: I18n.t("poll.ui_builder.poll_result.vote"),
value: votePollResult
},
{
name: I18n.t("poll.ui_builder.poll_result.closed"),
value: closedPollResult
}
];
},
@computed("pollType", "regularPollType")
isRegular(pollType, regularPollType) {
return pollType === regularPollType;
@ -128,6 +150,7 @@ export default Ember.Controller.extend({
"isNumber",
"showMinMax",
"pollType",
"pollResult",
"publicPoll",
"pollOptions",
"pollMin",
@ -141,6 +164,7 @@ export default Ember.Controller.extend({
isNumber,
showMinMax,
pollType,
pollResult,
publicPoll,
pollOptions,
pollMin,
@ -167,6 +191,7 @@ export default Ember.Controller.extend({
}
if (pollType) pollHeader += ` type=${pollType}`;
if (pollResult) pollHeader += ` results=${pollResult}`;
if (pollMin && showMinMax) pollHeader += ` min=${pollMin}`;
if (pollMax) pollHeader += ` max=${pollMax}`;
if (isNumber) pollHeader += ` step=${step}`;