@@ -142,38 +183,6 @@ export default class PollVote extends Component {
}
}
- onError(el, error) {
- el.srcElement.checked = false
-
- app.alerts.show(error.alert)
- }
-
- changeVote(answer, el) {
- app.request({
- method: 'PATCH',
- url: app.forum.attribute('apiUrl') + '/votes/' + answer,
- errorHandler: this.onError.bind(this, el),
- data: {
- option_id: answer,
- poll_id: this.poll.id()
- }
- }).then(() => {
- location.reload()
- });
- }
-
- view() {
- let content = this.voteView();
-
- return (
-
- {content}
-
- );
- }
-
addVote(answer, el) {
if (this.user === undefined) {
app.modal.show(new LogInModal())
@@ -181,10 +190,14 @@ export default class PollVote extends Component {
} else {
app.store.createRecord('votes').save({
poll_id: this.poll.id(),
- option_id: answer
- }).then(() => {
- location.reload()
- })
+ option_id: answer.id()
+ }).then(
+ vote => {
+ this.answers[answer.id()].data.attributes.votes++;
+ this.voted(vote);
+ this.poll.data.relationships.votes.data.push(vote)
+ m.redraw()
+ })
}
}
}
diff --git a/js/forum/src/main.js b/js/forum/src/main.js
index cd4d4eb..c1be9d7 100644
--- a/js/forum/src/main.js
+++ b/js/forum/src/main.js
@@ -28,7 +28,7 @@ app.initializers.add('reflar-polls', app => {
User.prototype.canSelfEditPolls = Model.attribute('canSelfEditPolls');
User.prototype.canVote = Model.attribute('canVote');
- DiscussionComposer.prototype.addPoll = function () {
+ DiscussionComposer.prototype.addPoll = function() {
app.modal.show(new PollModal());
};
@@ -36,10 +36,23 @@ app.initializers.add('reflar-polls', app => {
extend(DiscussionComposer.prototype, 'headerItems', function (items) {
if (app.session.user.canStartPolls()) {
items.add('polls', (
-
{app.translator.trans('reflar-polls.forum.composer_discussion.add_poll')}), 1);
+
+ {this.data().poll
+ ?
+ {app.translator.trans('reflar-polls.forum.composer_discussion.edit')}
+ :
+ {app.translator.trans('reflar-polls.forum.composer_discussion.add_poll')}}
+
+ ), 1);
}
});
+ extend(DiscussionComposer.prototype, 'onsubmit', function() {
+ extend(DiscussionComposer.prototype, 'data', function (data) {
+ data.poll = undefined;
+ });
+ })
+
addPollBadege();
PollDiscussion();
PollControl();
diff --git a/src/Api/Controllers/CreateAnswerController.php b/src/Api/Controllers/CreateAnswerController.php
index a1dee84..3fc2b7f 100644
--- a/src/Api/Controllers/CreateAnswerController.php
+++ b/src/Api/Controllers/CreateAnswerController.php
@@ -47,7 +47,7 @@ public function __construct(AnswerValidator $validator)
protected function data(ServerRequestInterface $request, Document $document)
{
$actor = $request->getAttribute('actor');
- $data = $request->getParsedBody();
+ $data = array_get($request->getParsedBody(), 'data.attributes', []);
$poll = Question::find($data['poll_id']);
$answer = Answer::build($data['answer']);
diff --git a/src/Api/Controllers/UpdateVoteController.php b/src/Api/Controllers/UpdateVoteController.php
index 4b563e4..f191034 100644
--- a/src/Api/Controllers/UpdateVoteController.php
+++ b/src/Api/Controllers/UpdateVoteController.php
@@ -51,13 +51,15 @@ protected function data(ServerRequestInterface $request, Document $document)
$this->assertNotFlooding($actor);
- Vote::where('user_id', $actor->id)->delete();
-
if (Question::find($attributes['poll_id'])->isEnded()) {
throw new PermissionDeniedException();
}
- $vote = Vote::build($attributes['poll_id'], $actor->id, $attributes['option_id']);
+ $vote = Vote::where('user_id', $actor->id)
+ ->where('poll_id', $attributes['poll_id'])
+ ->first();
+
+ $vote->option_id = $attributes['option_id'];
$actor->last_vote_time = new DateTime();
$actor->save();