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

FEATURE: Allow users to remove their vote (#14459)

Browse Source 
They can use the remove vote button or select the same option again for
single choice polls.

This commit refactor the plugin to properly organize code and make it
easier to follow.
This commit is contained in:
Bianca Nenciu
2021-10-05 11:38:49 +03:00
committed by GitHub
parent 12856ab8c2
commit 6a143030f8
13 changed files with 550 additions and 521 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
plugins/poll/assets/javascripts/widgets/discourse-poll.js.es6
View File

@ -636,24 +636,44 @@ createWidget("discourse-poll-buttons", {
})
);
} else {
let showResultsButton;
let infoText;
if (poll.results === "on_vote" && !attrs.hasVoted && !isMe) {
contents.push(infoTextHtml(I18n.t("poll.results.vote.title")));
infoText = infoTextHtml(I18n.t("poll.results.vote.title"));
} else if (poll.results === "on_close" && !closed) {
contents.push(infoTextHtml(I18n.t("poll.results.closed.title")));
infoText = infoTextHtml(I18n.t("poll.results.closed.title"));
} else if (poll.results === "staff_only" && !isStaff) {
contents.push(infoTextHtml(I18n.t("poll.results.staff.title")));
infoText = infoTextHtml(I18n.t("poll.results.staff.title"));
} else {
showResultsButton = this.attach("button", {
className: "btn-default toggle-results",
label: "poll.show-results.label",
title: "poll.show-results.title",
icon: "far-eye",
action: "toggleResults",
});
}
if (showResultsButton) {
contents.push(showResultsButton);
}
if (attrs.hasSavedVote) {
contents.push(
this.attach("button", {
className: "btn-default toggle-results",
label: "poll.show-results.label",
title: "poll.show-results.title",
icon: "far-eye",
disabled: poll.voters === 0,
action: "toggleResults",
className: "btn-default remove-vote",
label: "poll.remove-vote.label",
title: "poll.remove-vote.title",
icon: "trash-alt",
action: "removeVote",
})
);
}
if (infoText) {
contents.push(infoText);
}
}
if (attrs.groupableUserFields.length && poll.voters > 0) {
@ -894,6 +914,28 @@ export default createWidget("discourse-poll", {
this.state.showResults = !this.state.showResults;
},
removeVote() {
const { attrs, state } = this;
state.loading = true;
return ajax("/polls/vote", {
type: "DELETE",
data: {
post_id: attrs.post.id,
poll_name: attrs.poll.name,
},
})
.then(({ poll }) => {
attrs.poll.setProperties(poll);
attrs.vote.length = 0;
attrs.hasSavedVote = false;
this.appEvents.trigger("poll:voted", poll, attrs.post, attrs.vote);
})
.catch((error) => popupAjaxError(error))
.finally(() => {
state.loading = false;
});
},
exportResults() {
const { attrs } = this;
const queryID = this.siteSettings.poll_export_data_explorer_query_id;
@ -963,6 +1005,10 @@ export default createWidget("discourse-poll", {
}
const { vote } = attrs;
if (!this.isMultiple() && vote.length === 1 && vote[0] === option.id) {
return this.removeVote();
}
if (!this.isMultiple()) {
vote.length = 0;
}
@ -994,6 +1040,7 @@ export default createWidget("discourse-poll", {
},
})
.then(({ poll }) => {
attrs.hasSavedVote = true;
attrs.poll.setProperties(poll);
this.appEvents.trigger("poll:voted", poll, attrs.post, attrs.vote);