Page MenuHomePhabricator
Files F13189479

D13720.diff
No OneTemporary
Actions

D13720.diff
View Options

diff --git a/src/applications/slowvote/controller/PhabricatorSlowvoteCloseController.php b/src/applications/slowvote/controller/PhabricatorSlowvoteCloseController.php
--- a/src/applications/slowvote/controller/PhabricatorSlowvoteCloseController.php
+++ b/src/applications/slowvote/controller/PhabricatorSlowvoteCloseController.php
@@ -3,19 +3,13 @@
final class PhabricatorSlowvoteCloseController
extends PhabricatorSlowvoteController {
- private $id;
-
- public function willProcessRequest(array $data) {
- $this->id = $data['id'];
- }
-
- public function processRequest() {
- $request = $this->getRequest();
- $user = $request->getUser();
+ public function handleRequest(AphrontRequest $request) {
+ $viewer = $request->getViewer();
+ $id = $request->getURIData('id');
$poll = id(new PhabricatorSlowvoteQuery())
- ->setViewer($user)
- ->withIDs(array($this->id))
+ ->setViewer($viewer)
+ ->withIDs(array($id))
->requireCapabilities(
array(
PhabricatorPolicyCapability::CAN_VIEW,
@@ -42,7 +36,7 @@
->setNewValue($new_status);
id(new PhabricatorSlowvoteEditor())
- ->setActor($user)
+ ->setActor($viewer)
->setContentSourceFromRequest($request)
->setContinueOnNoEffect(true)
->setContinueOnMissingFields(true)
diff --git a/src/applications/slowvote/controller/PhabricatorSlowvoteCommentController.php b/src/applications/slowvote/controller/PhabricatorSlowvoteCommentController.php
--- a/src/applications/slowvote/controller/PhabricatorSlowvoteCommentController.php
+++ b/src/applications/slowvote/controller/PhabricatorSlowvoteCommentController.php
@@ -3,23 +3,17 @@
final class PhabricatorSlowvoteCommentController
extends PhabricatorSlowvoteController {
- private $id;
-
- public function willProcessRequest(array $data) {
- $this->id = $data['id'];
- }
-
- public function processRequest() {
- $request = $this->getRequest();
- $user = $request->getUser();
+ public function handleRequest(AphrontRequest $request) {
+ $viewer = $request->getViewer();
+ $id = $request->getURIData('id');
if (!$request->isFormPost()) {
return new Aphront400Response();
}
$poll = id(new PhabricatorSlowvoteQuery())
- ->setViewer($user)
- ->withIDs(array($this->id))
+ ->setViewer($viewer)
+ ->withIDs(array($id))
->executeOne();
if (!$poll) {
return new Aphront404Response();
@@ -38,7 +32,7 @@
->setContent($request->getStr('comment')));
$editor = id(new PhabricatorSlowvoteEditor())
- ->setActor($user)
+ ->setActor($viewer)
->setContinueOnNoEffect($request->isContinueRequest())
->setContentSourceFromRequest($request)
->setIsPreview($is_preview);
@@ -57,7 +51,7 @@
if ($request->isAjax() && $is_preview) {
return id(new PhabricatorApplicationTransactionResponse())
- ->setViewer($user)
+ ->setViewer($viewer)
->setTransactions($xactions)
->setIsPreview($is_preview);
} else {
diff --git a/src/applications/slowvote/controller/PhabricatorSlowvoteEditController.php b/src/applications/slowvote/controller/PhabricatorSlowvoteEditController.php
--- a/src/applications/slowvote/controller/PhabricatorSlowvoteEditController.php
+++ b/src/applications/slowvote/controller/PhabricatorSlowvoteEditController.php
@@ -3,21 +3,14 @@
final class PhabricatorSlowvoteEditController
extends PhabricatorSlowvoteController {
- private $id;
+ public function handleRequest(AphrontRequest $request) {
+ $viewer = $request->getViewer();
+ $id = $request->getURIData('id');
- public function willProcessRequest(array $data) {
- $this->id = idx($data, 'id');
- }
-
- public function processRequest() {
-
- $request = $this->getRequest();
- $user = $request->getUser();
-
- if ($this->id) {
+ if ($id) {
$poll = id(new PhabricatorSlowvoteQuery())
- ->setViewer($user)
- ->withIDs(array($this->id))
+ ->setViewer($viewer)
+ ->withIDs(array($id))
->requireCapabilities(
array(
PhabricatorPolicyCapability::CAN_VIEW,
@@ -29,7 +22,7 @@
}
$is_new = false;
} else {
- $poll = PhabricatorSlowvotePoll::initializeNewPoll($user);
+ $poll = PhabricatorSlowvotePoll::initializeNewPoll($viewer);
$is_new = true;
}
@@ -119,7 +112,7 @@
->setNewValue(array('=' => array_fuse($v_projects)));
$editor = id(new PhabricatorSlowvoteEditor())
- ->setActor($user)
+ ->setActor($viewer)
->setContinueOnNoEffect(true)
->setContentSourceFromRequest($request);
@@ -153,7 +146,7 @@
'protracted deliberation.'));
$form = id(new AphrontFormView())
- ->setUser($user)
+ ->setUser($viewer)
->appendChild($instructions)
->appendChild(
id(new AphrontFormTextAreaControl())
@@ -164,7 +157,7 @@
->setError($e_question))
->appendChild(
id(new PhabricatorRemarkupControl())
- ->setUser($user)
+ ->setUser($viewer)
->setLabel(pht('Description'))
->setName('description')
->setValue($v_description))
@@ -232,7 +225,7 @@
}
$policies = id(new PhabricatorPolicyQuery())
- ->setViewer($user)
+ ->setViewer($viewer)
->setObject($poll)
->execute();
@@ -253,7 +246,7 @@
$v_shuffle))
->appendChild(
id(new AphrontFormPolicyControl())
- ->setUser($user)
+ ->setUser($viewer)
->setName('viewPolicy')
->setPolicyObject($poll)
->setPolicies($policies)
diff --git a/src/applications/slowvote/controller/PhabricatorSlowvoteListController.php b/src/applications/slowvote/controller/PhabricatorSlowvoteListController.php
--- a/src/applications/slowvote/controller/PhabricatorSlowvoteListController.php
+++ b/src/applications/slowvote/controller/PhabricatorSlowvoteListController.php
@@ -3,19 +3,15 @@
final class PhabricatorSlowvoteListController
extends PhabricatorSlowvoteController {
- private $queryKey;
-
public function shouldAllowPublic() {
return true;
}
- public function willProcessRequest(array $data) {
- $this->queryKey = idx($data, 'queryKey');
- }
+ public function handleRequest(AphrontRequest $request) {
+ $querykey = $request->getURIData('queryKey');
- public function processRequest() {
$controller = id(new PhabricatorApplicationSearchController())
- ->setQueryKey($this->queryKey)
+ ->setQueryKey($querykey)
->setSearchEngine(new PhabricatorSlowvoteSearchEngine())
->setNavigation($this->buildSideNavView());
diff --git a/src/applications/slowvote/controller/PhabricatorSlowvotePollController.php b/src/applications/slowvote/controller/PhabricatorSlowvotePollController.php
--- a/src/applications/slowvote/controller/PhabricatorSlowvotePollController.php
+++ b/src/applications/slowvote/controller/PhabricatorSlowvotePollController.php
@@ -3,19 +3,13 @@
final class PhabricatorSlowvotePollController
extends PhabricatorSlowvoteController {
- private $id;
-
- public function willProcessRequest(array $data) {
- $this->id = $data['id'];
- }
-
- public function processRequest() {
- $request = $this->getRequest();
- $user = $request->getUser();
+ public function handleRequest(AphrontRequest $request) {
+ $viewer = $request->getViewer();
+ $id = $request->getURIData('id');
$poll = id(new PhabricatorSlowvoteQuery())
- ->setViewer($user)
- ->withIDs(array($this->id))
+ ->setViewer($viewer)
+ ->withIDs(array($id))
->needOptions(true)
->needChoices(true)
->needViewerChoices(true)
@@ -26,7 +20,7 @@
$poll_view = id(new SlowvoteEmbedView())
->setHeadless(true)
- ->setUser($user)
+ ->setUser($viewer)
->setPoll($poll);
if ($request->isAjax()) {
@@ -44,7 +38,7 @@
$header = id(new PHUIHeaderView())
->setHeader($poll->getQuestion())
- ->setUser($user)
+ ->setUser($viewer)
->setStatus($header_icon, $header_color, $header_name)
->setPolicyObject($poll);
diff --git a/src/applications/slowvote/controller/PhabricatorSlowvoteVoteController.php b/src/applications/slowvote/controller/PhabricatorSlowvoteVoteController.php
--- a/src/applications/slowvote/controller/PhabricatorSlowvoteVoteController.php
+++ b/src/applications/slowvote/controller/PhabricatorSlowvoteVoteController.php
@@ -3,19 +3,13 @@
final class PhabricatorSlowvoteVoteController
extends PhabricatorSlowvoteController {
- private $id;
-
- public function willProcessRequest(array $data) {
- $this->id = $data['id'];
- }
-
- public function processRequest() {
- $request = $this->getRequest();
- $user = $request->getUser();
+ public function handleRequest(AphrontRequest $request) {
+ $viewer = $request->getViewer();
+ $id = $request->getURIData('id');
$poll = id(new PhabricatorSlowvoteQuery())
- ->setViewer($user)
- ->withIDs(array($this->id))
+ ->setViewer($viewer)
+ ->withIDs(array($id))
->needOptions(true)
->needViewerChoices(true)
->executeOne();
@@ -27,9 +21,9 @@
}
$options = $poll->getOptions();
- $user_choices = $poll->getViewerChoices($user);
+ $viewer_choices = $poll->getViewerChoices($viewer);
- $old_votes = mpull($user_choices, null, 'getOptionID');
+ $old_votes = mpull($viewer_choices, null, 'getOptionID');
if ($request->isAjax()) {
$vote = $request->getInt('vote');
@@ -50,12 +44,12 @@
}
}
- $this->updateVotes($user, $poll, $old_votes, $votes);
+ $this->updateVotes($viewer, $poll, $old_votes, $votes);
$updated_choices = id(new PhabricatorSlowvoteChoice())->loadAllWhere(
'pollID = %d AND authorPHID = %s',
$poll->getID(),
- $user->getPHID());
+ $viewer->getPHID());
$embed = id(new SlowvoteEmbedView())
->setPoll($poll)
@@ -76,12 +70,12 @@
$votes = $request->getArr('vote');
$votes = array_fuse($votes, $votes);
- $this->updateVotes($user, $poll, $old_votes, $votes);
+ $this->updateVotes($viewer, $poll, $old_votes, $votes);
return id(new AphrontRedirectResponse())->setURI('/V'.$poll->getID());
}
- private function updateVotes($user, $poll, $old_votes, $votes) {
+ private function updateVotes($viewer, $poll, $old_votes, $votes) {
if (!empty($votes) && count($votes) > 1 &&
$poll->getMethod() == PhabricatorSlowvotePoll::METHOD_PLURALITY) {
return id(new Aphront400Response());
@@ -99,7 +93,7 @@
}
id(new PhabricatorSlowvoteChoice())
- ->setAuthorPHID($user->getPHID())
+ ->setAuthorPHID($viewer->getPHID())
->setPollID($poll->getID())
->setOptionID($vote)
->save();

File Metadata

Mime Type
text/plain
Expires
Sun, May 12, 6:05 AM (3 w, 3 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
6290473
Default Alt Text
D13720.diff (10 KB)

Event Timeline

Phabricator · Built by Phacility