View Options

	diff --git a/src/applications/slowvote/controller/PhabricatorSlowvoteVoteController.php b/src/applications/slowvote/controller/PhabricatorSlowvoteVoteController.php
	index 62913b09e3..e1a1b9df34 100644
	--- a/src/applications/slowvote/controller/PhabricatorSlowvoteVoteController.php
	+++ b/src/applications/slowvote/controller/PhabricatorSlowvoteVoteController.php
	@@ -1,77 +1,106 @@
	<?php

	final class PhabricatorSlowvoteVoteController
	extends PhabricatorSlowvoteController {

	public function handleRequest(AphrontRequest $request) {
	$viewer = $request->getViewer();
	$id = $request->getURIData('id');

	if (!$request->isFormPost()) {
	return id(new Aphront404Response());
	}

	$poll = id(new PhabricatorSlowvoteQuery())
	->setViewer($viewer)
	->withIDs(array($id))
	->needOptions(true)
	->needViewerChoices(true)
	->executeOne();
	if (!$poll) {
	return new Aphront404Response();
	}

	if ($poll->getIsClosed()) {
	return new Aphront400Response();
	}

	$options = $poll->getOptions();
	$options = mpull($options, null, 'getID');

	$old_votes = $poll->getViewerChoices($viewer);
	$old_votes = mpull($old_votes, null, 'getOptionID');

	$votes = $request->getArr('vote');
	$votes = array_fuse($votes);

	$method = $poll->getMethod();
	$is_plurality = ($method == PhabricatorSlowvotePoll::METHOD_PLURALITY);

	+ if (!$votes) {
	+ if ($is_plurality) {
	+ $message = pht('You must vote for something.');
	+ } else {
	+ $message = pht('You must vote for at least one option.');
	+ }
	+
	+ return $this->newDialog()
	+ ->setTitle(pht('Stand For Something'))
	+ ->appendParagraph($message)
	+ ->addCancelButton($poll->getURI());
	+ }
	+
	if ($is_plurality && count($votes) > 1) {
	throw new Exception(
	pht('In this poll, you may only vote for one option.'));
	}

	foreach ($votes as $vote) {
	if (!isset($options[$vote])) {
	throw new Exception(
	pht(
	'Option ("%s") is not a valid poll option. You may only '.
	'vote for valid options.',
	$vote));
	}
	}

	- foreach ($old_votes as $old_vote) {
	- if (!idx($votes, $old_vote->getOptionID(), false)) {
	+ $poll->openTransaction();
	+ $poll->beginReadLocking();
	+
	+ $poll->reload();
	+
	+ $old_votes = id(new PhabricatorSlowvoteChoice())->loadAllWhere(
	+ 'pollID = %d AND authorPHID = %s',
	+ $poll->getID(),
	+ $viewer->getPHID());
	+ $old_votes = mpull($old_votes, null, 'getOptionID');
	+
	+ foreach ($old_votes as $old_vote) {
	+ if (idx($votes, $old_vote->getOptionID())) {
	+ continue;
	+ }
	+
	$old_vote->delete();
	}
	- }

	- foreach ($votes as $vote) {
	- if (idx($old_votes, $vote, false)) {
	- continue;
	+ foreach ($votes as $vote) {
	+ if (idx($old_votes, $vote)) {
	+ continue;
	+ }
	+
	+ id(new PhabricatorSlowvoteChoice())
	+ ->setAuthorPHID($viewer->getPHID())
	+ ->setPollID($poll->getID())
	+ ->setOptionID($vote)
	+ ->save();
	}

	- id(new PhabricatorSlowvoteChoice())
	- ->setAuthorPHID($viewer->getPHID())
	- ->setPollID($poll->getID())
	- ->setOptionID($vote)
	- ->save();
	- }
	+ $poll->endReadLocking();
	+ $poll->saveTransaction();

	return id(new AphrontRedirectResponse())
	->setURI($poll->getURI());
	}

	}

File Metadata

Mime Type: text/x-diff
Expires: Sun, Jan 19, 18:53 (1 w, 3 d ago)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 1127598
Default Alt Text: (3 KB)

No OneTemporary
Actions

View Options

File Metadata

Event Timeline

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions