Update Differential for handleRequest

Summary: Moves from processRequest to handleRequest.

Test Plan: New diff, edit diff, leave comment, view list, browse revisions, etc.

Reviewers: epriestley

Reviewed By: epriestley

Subscribers: Korvin

Differential Revision: https://secure.phabricator.com/D14252
This commit is contained in:
Chad Little
2015-10-11 08:18:42 -07:00
parent 2f6d3119f5
commit bb37ad65a2
8 changed files with 47 additions and 91 deletions

View File

@@ -8,15 +8,11 @@ final class DifferentialRevisionViewController extends DifferentialController {
return true;
}
public function willProcessRequest(array $data) {
$this->revisionID = $data['id'];
}
public function handleRequest(AphrontRequest $request) {
$viewer = $this->getViewer();
$this->revisionID = $request->getURIData('id');
public function processRequest() {
$request = $this->getRequest();
$user = $request->getUser();
$viewer_is_anonymous = !$user->isLoggedIn();
$viewer_is_anonymous = !$viewer->isLoggedIn();
$revision = id(new DifferentialRevisionQuery())
->withIDs(array($this->revisionID))
@@ -68,7 +64,7 @@ final class DifferentialRevisionViewController extends DifferentialController {
$repository = $revision->getRepository();
} else {
$repository = id(new PhabricatorRepositoryQuery())
->setViewer($user)
->setViewer($viewer)
->withPHIDs(array($repository_phid))
->executeOne();
}
@@ -117,7 +113,7 @@ final class DifferentialRevisionViewController extends DifferentialController {
$revision->loadCommitPHIDs(),
array(
$revision->getAuthorPHID(),
$user->getPHID(),
$viewer->getPHID(),
));
foreach ($revision->getAttached() as $type => $phids) {
@@ -130,7 +126,7 @@ final class DifferentialRevisionViewController extends DifferentialController {
$revision,
PhabricatorCustomField::ROLE_VIEW);
$field_list->setViewer($user);
$field_list->setViewer($viewer);
$field_list->readFieldsFromStorage($revision);
$warning_handle_map = array();
@@ -174,7 +170,7 @@ final class DifferentialRevisionViewController extends DifferentialController {
$new = array_select_keys($changesets, $new_ids);
$query = id(new DifferentialInlineCommentQuery())
->setViewer($user)
->setViewer($viewer)
->needHidden(true)
->withRevisionPHIDs(array($revision->getPHID()));
$inlines = $query->execute();
@@ -205,7 +201,7 @@ final class DifferentialRevisionViewController extends DifferentialController {
$commit_hashes = array_unique(array_filter($commit_hashes));
if ($commit_hashes) {
$commits_for_links = id(new DiffusionCommitQuery())
->setViewer($user)
->setViewer($viewer)
->withIdentifiers($commit_hashes)
->execute();
$commits_for_links = mpull(
@@ -217,7 +213,7 @@ final class DifferentialRevisionViewController extends DifferentialController {
}
$revision_detail = id(new DifferentialRevisionDetailView())
->setUser($user)
->setUser($viewer)
->setRevision($revision)
->setDiff(end($diffs))
->setCustomFields($field_list)
@@ -239,7 +235,7 @@ final class DifferentialRevisionViewController extends DifferentialController {
}
$revision_detail->setActions($actions);
$revision_detail->setUser($user);
$revision_detail->setUser($viewer);
$revision_detail_box = $revision_detail->render();
@@ -261,7 +257,7 @@ final class DifferentialRevisionViewController extends DifferentialController {
$detail_diffs = mpull($detail_diffs, null, 'getPHID');
$buildables = id(new HarbormasterBuildableQuery())
->setViewer($user)
->setViewer($viewer)
->withBuildablePHIDs(array_keys($detail_diffs))
->withManualBuildables(false)
->needBuilds(true)
@@ -311,7 +307,7 @@ final class DifferentialRevisionViewController extends DifferentialController {
'/differential/changeset/?view=old',
'/differential/changeset/?view=new');
$changeset_view->setUser($user);
$changeset_view->setUser($viewer);
$changeset_view->setDiff($target);
$changeset_view->setRenderingReferences($rendering_references);
$changeset_view->setVsMap($vs_map);
@@ -323,7 +319,7 @@ final class DifferentialRevisionViewController extends DifferentialController {
$changeset_view->setTitle(pht('Diff %s', $target->getID()));
$diff_history = id(new DifferentialRevisionUpdateHistoryView())
->setUser($user)
->setUser($viewer)
->setDiffs($diffs)
->setSelectedVersusDiffID($diff_vs)
->setSelectedDiffID($target->getID())
@@ -331,7 +327,7 @@ final class DifferentialRevisionViewController extends DifferentialController {
->setCommitsForLinks($commits_for_links);
$local_view = id(new DifferentialLocalCommitsView())
->setUser($user)
->setUser($viewer)
->setLocalCommits(idx($props, 'local:commits'))
->setCommitsForLinks($commits_for_links);
@@ -352,13 +348,13 @@ final class DifferentialRevisionViewController extends DifferentialController {
$toc_view = $this->buildTableOfContents(
$changesets,
$visible_changesets,
$target->loadCoverageMap($user));
$target->loadCoverageMap($viewer));
$comment_form = null;
if (!$viewer_is_anonymous) {
$draft = id(new PhabricatorDraft())->loadOneWhere(
'authorPHID = %s AND draftKey = %s',
$user->getPHID(),
$viewer->getPHID(),
'differential-comment-'.$revision->getID());
$reviewers = array();
@@ -394,7 +390,7 @@ final class DifferentialRevisionViewController extends DifferentialController {
'comment/save/'.$revision->getID().'/');
$comment_form->setActionURI($action_uri);
$comment_form->setUser($user);
$comment_form->setUser($viewer);
$comment_form->setDraft($draft);
$comment_form->setReviewers(mpull($reviewers, 'getFullName', 'getPHID'));
$comment_form->setCCs(mpull($ccs, 'getFullName', 'getPHID'));
@@ -461,7 +457,7 @@ final class DifferentialRevisionViewController extends DifferentialController {
// TODO: For now, just use this to get "Login to Comment".
$page_pane->appendChild(
id(new PhabricatorApplicationTransactionCommentView())
->setUser($user)
->setUser($viewer)
->setRequestURI($request->getRequestURI()));
}
@@ -476,7 +472,7 @@ final class DifferentialRevisionViewController extends DifferentialController {
$crumbs = $this->buildApplicationCrumbs();
$crumbs->addTextCrumb($object_id, '/'.$object_id);
$prefs = $user->loadPreferences();
$prefs = $viewer->loadPreferences();
$pref_filetree = PhabricatorUserPreferences::PREFERENCE_DIFF_FILETREE;
if ($prefs->getPreference($pref_filetree)) {