Remove all setObjectURI() from ActionListViews

epriestley · epriestley · commit 2868a69f658c · 2015-12-17T08:30:22.000-08:00
Summary: Ref T10004. After D14804, we get this behavior by default and no longer need to set it explicitly. (If some endpoint did eventually need to set it explicitly, it could just change what it passes to `setHref()`, but I believe we currently have no such endpoints and do not foresee ever having any.) Test Plan: - As a logged out user, clicked various links in Differential, Maniphest, Files, etc., always got redirected to a sensible place after login. - Grepped for `setObjectURI()`, `getObjectURI()` (there are a few remaining callsites, but to a different method with the same name in Doorkeeper). Reviewers: chad Reviewed By: chad Subscribers: hach-que Maniphest Tasks: T10004 Differential Revision: https://secure.phabricator.com/D14805
diff --git a/src/applications/calendar/controller/PhabricatorCalendarEventViewController.php b/src/applications/calendar/controller/PhabricatorCalendarEventViewController.php
@@ -152,7 +152,6 @@ private function buildActionView(PhabricatorCalendarEvent $event) {
     $is_attending = $event->getIsUserAttending($viewer->getPHID());
 
     $actions = id(new PhabricatorActionListView())
-      ->setObjectURI($this->getApplicationURI('event/'.$id.'/'))
       ->setUser($viewer)
       ->setObject($event);
 
diff --git a/src/applications/dashboard/controller/PhabricatorDashboardManageController.php b/src/applications/dashboard/controller/PhabricatorDashboardManageController.php
@@ -99,7 +99,6 @@ private function buildActionView(PhabricatorDashboard $dashboard) {
     $id = $dashboard->getID();
 
     $actions = id(new PhabricatorActionListView())
-      ->setObjectURI($this->getApplicationURI('view/'.$dashboard->getID().'/'))
       ->setObject($dashboard)
       ->setUser($viewer);
 
diff --git a/src/applications/dashboard/controller/PhabricatorDashboardPanelViewController.php b/src/applications/dashboard/controller/PhabricatorDashboardPanelViewController.php
@@ -84,7 +84,6 @@ private function buildActionView(PhabricatorDashboardPanel $panel) {
     $id = $panel->getID();
 
     $actions = id(new PhabricatorActionListView())
-      ->setObjectURI('/'.$panel->getMonogram())
       ->setObject($panel)
       ->setUser($viewer);
 
diff --git a/src/applications/differential/view/DifferentialRevisionDetailView.php b/src/applications/differential/view/DifferentialRevisionDetailView.php
@@ -63,8 +63,7 @@ public function render() {
 
     $actions = id(new PhabricatorActionListView())
       ->setUser($user)
-      ->setObject($revision)
-      ->setObjectURI($this->getURI());
+      ->setObject($revision);
     foreach ($this->getActions() as $action) {
       $actions->addAction($action);
     }
diff --git a/src/applications/diffusion/controller/DiffusionCommitController.php b/src/applications/diffusion/controller/DiffusionCommitController.php
@@ -903,8 +903,7 @@ private function renderHeadsupActionList(
 
     $actions = id(new PhabricatorActionListView())
       ->setUser($user)
-      ->setObject($commit)
-      ->setObjectURI($request->getRequestURI());
+      ->setObject($commit);
 
     $can_edit = PhabricatorPolicyFilter::hasCapability(
       $user,
diff --git a/src/applications/diffusion/controller/DiffusionRepositoryController.php b/src/applications/diffusion/controller/DiffusionRepositoryController.php
@@ -480,13 +480,11 @@ private function buildTagListTable(DiffusionRequest $drequest) {
   private function buildActionList(PhabricatorRepository $repository) {
     $viewer = $this->getRequest()->getUser();
 
-    $view_uri = $this->getApplicationURI($repository->getCallsign().'/');
     $edit_uri = $this->getApplicationURI($repository->getCallsign().'/edit/');
 
     $view = id(new PhabricatorActionListView())
       ->setUser($viewer)
-      ->setObject($repository)
-      ->setObjectURI($view_uri);
+      ->setObject($repository);
 
     $can_edit = PhabricatorPolicyFilter::hasCapability(
       $viewer,
diff --git a/src/applications/diffusion/controller/DiffusionRepositoryEditMainController.php b/src/applications/diffusion/controller/DiffusionRepositoryEditMainController.php
@@ -224,7 +224,6 @@ private function buildBasicActions(PhabricatorRepository $repository) {
     $viewer = $this->getRequest()->getUser();
 
     $view = id(new PhabricatorActionListView())
-      ->setObjectURI($this->getRequest()->getRequestURI())
       ->setUser($viewer);
 
     $edit = id(new PhabricatorActionView())
@@ -327,7 +326,6 @@ private function buildEncodingActions(PhabricatorRepository $repository) {
     $viewer = $this->getRequest()->getUser();
 
     $view = id(new PhabricatorActionListView())
-      ->setObjectURI($this->getRequest()->getRequestURI())
       ->setUser($viewer);
 
     $edit = id(new PhabricatorActionView())
@@ -364,7 +362,6 @@ private function buildPolicyActions(PhabricatorRepository $repository) {
     $viewer = $this->getRequest()->getUser();
 
     $view = id(new PhabricatorActionListView())
-      ->setObjectURI($this->getRequest()->getRequestURI())
       ->setUser($viewer);
 
     $edit = id(new PhabricatorActionView())
@@ -419,7 +416,6 @@ private function buildBranchesActions(PhabricatorRepository $repository) {
     $viewer = $this->getRequest()->getUser();
 
     $view = id(new PhabricatorActionListView())
-      ->setObjectURI($this->getRequest()->getRequestURI())
       ->setUser($viewer);
 
     $edit = id(new PhabricatorActionView())
@@ -469,7 +465,6 @@ private function buildSubversionActions(PhabricatorRepository $repository) {
     $viewer = $this->getRequest()->getUser();
 
     $view = id(new PhabricatorActionListView())
-      ->setObjectURI($this->getRequest()->getRequestURI())
       ->setUser($viewer);
 
     $edit = id(new PhabricatorActionView())
@@ -509,7 +504,6 @@ private function buildActionsActions(PhabricatorRepository $repository) {
     $viewer = $this->getRequest()->getUser();
 
     $view = id(new PhabricatorActionListView())
-      ->setObjectURI($this->getRequest()->getRequestURI())
       ->setUser($viewer);
 
     $edit = id(new PhabricatorActionView())
@@ -551,7 +545,6 @@ private function buildRemoteActions(PhabricatorRepository $repository) {
     $viewer = $this->getRequest()->getUser();
 
     $view = id(new PhabricatorActionListView())
-      ->setObjectURI($this->getRequest()->getRequestURI())
       ->setUser($viewer);
 
     $edit = id(new PhabricatorActionView())
@@ -592,7 +585,6 @@ private function buildStorageActions(PhabricatorRepository $repository) {
     $viewer = $this->getRequest()->getUser();
 
     $view = id(new PhabricatorActionListView())
-      ->setObjectURI($this->getRequest()->getRequestURI())
       ->setUser($viewer);
 
     $edit = id(new PhabricatorActionView())
@@ -640,7 +632,6 @@ private function buildStagingActions(PhabricatorRepository $repository) {
     $viewer = $this->getViewer();
 
     $view = id(new PhabricatorActionListView())
-      ->setObjectURI($this->getRequest()->getRequestURI())
       ->setUser($viewer);
 
     $edit = id(new PhabricatorActionView())
@@ -678,7 +669,6 @@ private function buildAutomationActions(PhabricatorRepository $repository) {
     $viewer = $this->getViewer();
 
     $view = id(new PhabricatorActionListView())
-      ->setObjectURI($this->getRequest()->getRequestURI())
       ->setUser($viewer);
 
     $edit = id(new PhabricatorActionView())
@@ -732,7 +722,6 @@ private function buildHostingActions(PhabricatorRepository $repository) {
     $user = $this->getRequest()->getUser();
 
     $view = id(new PhabricatorActionListView())
-      ->setObjectURI($this->getRequest()->getRequestURI())
       ->setUser($user);
 
     $edit = id(new PhabricatorActionView())
@@ -1240,7 +1229,6 @@ private function buildMirrorActions(
     $viewer = $this->getRequest()->getUser();
 
     $mirror_actions = id(new PhabricatorActionListView())
-      ->setObjectURI($this->getRequest()->getRequestURI())
       ->setUser($viewer);
 
     $new_mirror_uri = $this->getRepositoryControllerURI(
@@ -1319,7 +1307,6 @@ private function buildSymbolsActions(PhabricatorRepository $repository) {
     $viewer = $this->getRequest()->getUser();
 
     $view = id(new PhabricatorActionListView())
-      ->setObjectURI($this->getRequest()->getRequestURI())
       ->setUser($viewer);
 
     $edit = id(new PhabricatorActionView())
diff --git a/src/applications/diviner/controller/DivinerBookController.php b/src/applications/diviner/controller/DivinerBookController.php
@@ -125,8 +125,7 @@ private function buildActionView(
 
     $action_view = id(new PhabricatorActionListView())
       ->setUser($user)
-      ->setObject($book)
-      ->setObjectURI($this->getRequest()->getRequestURI());
+      ->setObject($book);
 
     $action_view->addAction(
       id(new PhabricatorActionView())
diff --git a/src/applications/drydock/controller/DrydockAuthorizationViewController.php b/src/applications/drydock/controller/DrydockAuthorizationViewController.php
@@ -67,7 +67,6 @@ private function buildActionListView(DrydockAuthorization $authorization) {
 
     $view = id(new PhabricatorActionListView())
       ->setUser($viewer)
-      ->setObjectURI($this->getRequest()->getRequestURI())
       ->setObject($authorization);
 
     $can_edit = PhabricatorPolicyFilter::hasCapability(
diff --git a/src/applications/drydock/controller/DrydockBlueprintViewController.php b/src/applications/drydock/controller/DrydockBlueprintViewController.php
@@ -86,7 +86,6 @@ private function buildActionListView(DrydockBlueprint $blueprint) {
 
     $view = id(new PhabricatorActionListView())
       ->setUser($viewer)
-      ->setObjectURI($this->getRequest()->getRequestURI())
       ->setObject($blueprint);
 
     $edit_uri = $this->getApplicationURI("blueprint/edit/{$id}/");
diff --git a/src/applications/drydock/controller/DrydockLeaseViewController.php b/src/applications/drydock/controller/DrydockLeaseViewController.php
@@ -66,7 +66,6 @@ private function buildActionListView(DrydockLease $lease) {
 
     $view = id(new PhabricatorActionListView())
       ->setUser($viewer)
-      ->setObjectURI($this->getRequest()->getRequestURI())
       ->setObject($lease);
 
     $id = $lease->getID();
diff --git a/src/applications/drydock/controller/DrydockRepositoryOperationViewController.php b/src/applications/drydock/controller/DrydockRepositoryOperationViewController.php
@@ -68,7 +68,6 @@ private function buildActionListView(DrydockRepositoryOperation $operation) {
 
     $view = id(new PhabricatorActionListView())
       ->setUser($viewer)
-      ->setObjectURI($this->getRequest()->getRequestURI())
       ->setObject($operation);
 
     return $view;
diff --git a/src/applications/drydock/controller/DrydockResourceViewController.php b/src/applications/drydock/controller/DrydockResourceViewController.php
@@ -74,7 +74,6 @@ private function buildActionListView(DrydockResource $resource) {
 
     $view = id(new PhabricatorActionListView())
       ->setUser($viewer)
-      ->setObjectURI($this->getRequest()->getRequestURI())
       ->setObject($resource);
 
     $can_release = $resource->canRelease();
diff --git a/src/applications/files/controller/PhabricatorFileInfoController.php b/src/applications/files/controller/PhabricatorFileInfoController.php
@@ -120,7 +120,6 @@ private function buildActionView(PhabricatorFile $file) {
 
     $view = id(new PhabricatorActionListView())
       ->setUser($viewer)
-      ->setObjectURI($this->getRequest()->getRequestURI())
       ->setObject($file);
 
     $can_download = !$file->getIsPartial();
diff --git a/src/applications/harbormaster/controller/HarbormasterBuildViewController.php b/src/applications/harbormaster/controller/HarbormasterBuildViewController.php
@@ -445,8 +445,7 @@ private function buildActionList(HarbormasterBuild $build) {
 
     $list = id(new PhabricatorActionListView())
       ->setUser($viewer)
-      ->setObject($build)
-      ->setObjectURI("/build/{$id}");
+      ->setObject($build);
 
     $can_restart = $build->canRestartBuild();
     $can_pause = $build->canPauseBuild();
diff --git a/src/applications/harbormaster/controller/HarbormasterBuildableViewController.php b/src/applications/harbormaster/controller/HarbormasterBuildableViewController.php
@@ -74,8 +74,7 @@ private function buildActionList(HarbormasterBuildable $buildable) {
 
     $list = id(new PhabricatorActionListView())
       ->setUser($viewer)
-      ->setObject($buildable)
-      ->setObjectURI($buildable->getMonogram());
+      ->setObject($buildable);
 
     $can_edit = PhabricatorPolicyFilter::hasCapability(
       $viewer,
diff --git a/src/applications/harbormaster/controller/HarbormasterPlanViewController.php b/src/applications/harbormaster/controller/HarbormasterPlanViewController.php
@@ -221,8 +221,7 @@ private function buildActionList(HarbormasterBuildPlan $plan) {
 
     $list = id(new PhabricatorActionListView())
       ->setUser($viewer)
-      ->setObject($plan)
-      ->setObjectURI($this->getApplicationURI("plan/{$id}/"));
+      ->setObject($plan);
 
     $can_edit = PhabricatorPolicyFilter::hasCapability(
       $viewer,
diff --git a/src/applications/herald/controller/HeraldRuleViewController.php b/src/applications/herald/controller/HeraldRuleViewController.php
@@ -67,8 +67,7 @@ private function buildActionView(HeraldRule $rule) {
 
     $view = id(new PhabricatorActionListView())
       ->setUser($viewer)
-      ->setObject($rule)
-      ->setObjectURI('/'.$rule->getMonogram());
+      ->setObject($rule);
 
     $can_edit = PhabricatorPolicyFilter::hasCapability(
       $viewer,
diff --git a/src/applications/legalpad/controller/LegalpadDocumentManageController.php b/src/applications/legalpad/controller/LegalpadDocumentManageController.php
@@ -98,7 +98,6 @@ private function buildActionView(LegalpadDocument $document) {
 
     $actions = id(new PhabricatorActionListView())
       ->setUser($viewer)
-      ->setObjectURI($this->getRequest()->getRequestURI())
       ->setObject($document);
 
     $can_edit = PhabricatorPolicyFilter::hasCapability(
diff --git a/src/applications/macro/controller/PhabricatorMacroViewController.php b/src/applications/macro/controller/PhabricatorMacroViewController.php
@@ -104,7 +104,6 @@ private function buildActionView(PhabricatorFileImageMacro $macro) {
     $view = id(new PhabricatorActionListView())
       ->setUser($request->getUser())
       ->setObject($macro)
-      ->setObjectURI($request->getRequestURI())
       ->addAction(
         id(new PhabricatorActionView())
         ->setName(pht('Edit Macro'))
diff --git a/src/applications/maniphest/controller/ManiphestTaskDetailController.php b/src/applications/maniphest/controller/ManiphestTaskDetailController.php
@@ -136,8 +136,7 @@ private function buildActionView(ManiphestTask $task) {
 
     $view = id(new PhabricatorActionListView())
       ->setUser($viewer)
-      ->setObject($task)
-      ->setObjectURI($this->getRequest()->getRequestURI());
+      ->setObject($task);
 
     $view->addAction(
       id(new PhabricatorActionView())
diff --git a/src/applications/meta/controller/PhabricatorApplicationDetailViewController.php b/src/applications/meta/controller/PhabricatorApplicationDetailViewController.php
@@ -135,8 +135,7 @@ private function buildActionView(
     PhabricatorApplication $selected) {
 
     $view = id(new PhabricatorActionListView())
-      ->setUser($user)
-      ->setObjectURI($this->getRequest()->getRequestURI());
+      ->setUser($user);
 
     $can_edit = PhabricatorPolicyFilter::hasCapability(
       $user,
diff --git a/src/applications/nuance/controller/NuanceQueueViewController.php b/src/applications/nuance/controller/NuanceQueueViewController.php
@@ -59,7 +59,6 @@ private function buildActionView(NuanceQueue $queue) {
     $id = $queue->getID();
 
     $actions = id(new PhabricatorActionListView())
-      ->setObjectURI($queue->getURI())
       ->setUser($viewer);
 
     $can_edit = PhabricatorPolicyFilter::hasCapability(
diff --git a/src/applications/nuance/controller/NuanceSourceViewController.php b/src/applications/nuance/controller/NuanceSourceViewController.php
@@ -80,7 +80,6 @@ private function buildActionView(NuanceSource $source) {
     $id = $source->getID();
 
     $actions = id(new PhabricatorActionListView())
-      ->setObjectURI($source->getURI())
       ->setUser($viewer);
 
     $can_edit = PhabricatorPolicyFilter::hasCapability(
diff --git a/src/applications/passphrase/controller/PassphraseCredentialViewController.php b/src/applications/passphrase/controller/PassphraseCredentialViewController.php
@@ -89,7 +89,6 @@ private function buildActionView(
     }
 
     $actions = id(new PhabricatorActionListView())
-      ->setObjectURI('/K'.$id)
       ->setObject($credential)
       ->setUser($viewer);
 
diff --git a/src/applications/paste/controller/PhabricatorPasteViewController.php b/src/applications/paste/controller/PhabricatorPasteViewController.php
@@ -131,8 +131,7 @@ private function buildActionView(
 
     $action_list = id(new PhabricatorActionListView())
       ->setUser($viewer)
-      ->setObject($paste)
-      ->setObjectURI($this->getRequest()->getRequestURI());
+      ->setObject($paste);
 
     $action_list->addAction(
         id(new PhabricatorActionView())
diff --git a/src/applications/people/controller/PhabricatorPeopleProfileController.php b/src/applications/people/controller/PhabricatorPeopleProfileController.php
@@ -43,7 +43,6 @@ public function processRequest() {
 
     $actions = id(new PhabricatorActionListView())
       ->setObject($user)
-      ->setObjectURI($this->getRequest()->getRequestURI())
       ->setUser($viewer);
 
     $can_edit = PhabricatorPolicyFilter::hasCapability(
diff --git a/src/applications/phame/controller/blog/PhameBlogManageController.php b/src/applications/phame/controller/blog/PhameBlogManageController.php
@@ -134,7 +134,6 @@ private function renderProperties(
   private function renderActions(PhameBlog $blog, PhabricatorUser $viewer) {
     $actions = id(new PhabricatorActionListView())
       ->setObject($blog)
-      ->setObjectURI($this->getRequest()->getRequestURI())
       ->setUser($viewer);
 
     $can_edit = PhabricatorPolicyFilter::hasCapability(
diff --git a/src/applications/phame/controller/blog/PhameBlogViewController.php b/src/applications/phame/controller/blog/PhameBlogViewController.php
@@ -108,7 +108,6 @@ private function renderActions(PhameBlog $blog) {
 
     $actions = id(new PhabricatorActionListView())
       ->setObject($blog)
-      ->setObjectURI($this->getRequest()->getRequestURI())
       ->setUser($viewer);
 
     $can_edit = PhabricatorPolicyFilter::hasCapability(
diff --git a/src/applications/phame/controller/post/PhamePostViewController.php b/src/applications/phame/controller/post/PhamePostViewController.php
@@ -155,7 +155,6 @@ private function renderActions(PhamePost $post) {
 
     $actions = id(new PhabricatorActionListView())
       ->setObject($post)
-      ->setObjectURI($this->getRequest()->getRequestURI())
       ->setUser($viewer);
 
     $can_edit = PhabricatorPolicyFilter::hasCapability(
diff --git a/src/applications/phlux/controller/PhluxViewController.php b/src/applications/phlux/controller/PhluxViewController.php
@@ -28,7 +28,6 @@ public function handleRequest(AphrontRequest $request) {
 
     $actions = id(new PhabricatorActionListView())
       ->setUser($viewer)
-      ->setObjectURI($request->getRequestURI())
       ->setObject($var);
 
     $can_edit = PhabricatorPolicyFilter::hasCapability(
diff --git a/src/applications/pholio/controller/PholioMockViewController.php b/src/applications/pholio/controller/PholioMockViewController.php
@@ -117,7 +117,6 @@ private function buildActionView(PholioMock $mock) {
 
     $actions = id(new PhabricatorActionListView())
       ->setUser($viewer)
-      ->setObjectURI($this->getRequest()->getRequestURI())
       ->setObject($mock);
 
     $can_edit = PhabricatorPolicyFilter::hasCapability(
diff --git a/src/applications/phortune/controller/PhortuneAccountViewController.php b/src/applications/phortune/controller/PhortuneAccountViewController.php
@@ -44,7 +44,6 @@ public function handleRequest(AphrontRequest $request) {
 
     $actions = id(new PhabricatorActionListView())
       ->setUser($viewer)
-      ->setObjectURI($request->getRequestURI())
       ->addAction(
         id(new PhabricatorActionView())
           ->setName(pht('Edit Account'))
diff --git a/src/applications/phortune/controller/PhortuneProductViewController.php b/src/applications/phortune/controller/PhortuneProductViewController.php
@@ -22,8 +22,7 @@ public function handleRequest(AphrontRequest $request) {
     $edit_uri = $this->getApplicationURI('product/edit/'.$product->getID().'/');
 
     $actions = id(new PhabricatorActionListView())
-      ->setUser($viewer)
-      ->setObjectURI($request->getRequestURI());
+      ->setUser($viewer);
 
     $crumbs = $this->buildApplicationCrumbs();
     $crumbs->addTextCrumb(
diff --git a/src/applications/phortune/controller/PhortuneSubscriptionViewController.php b/src/applications/phortune/controller/PhortuneSubscriptionViewController.php
diff --git a/src/applications/phragment/controller/PhragmentController.php b/src/applications/phragment/controller/PhragmentController.php
diff --git a/src/applications/phragment/controller/PhragmentSnapshotViewController.php b/src/applications/phragment/controller/PhragmentSnapshotViewController.php
diff --git a/src/applications/phragment/controller/PhragmentVersionController.php b/src/applications/phragment/controller/PhragmentVersionController.php
diff --git a/src/applications/phriction/controller/PhrictionDocumentController.php b/src/applications/phriction/controller/PhrictionDocumentController.php
diff --git a/src/applications/phurl/controller/PhabricatorPhurlURLViewController.php b/src/applications/phurl/controller/PhabricatorPhurlURLViewController.php
diff --git a/src/applications/ponder/controller/PonderQuestionViewController.php b/src/applications/ponder/controller/PonderQuestionViewController.php
diff --git a/src/applications/ponder/view/PonderAnswerView.php b/src/applications/ponder/view/PonderAnswerView.php
diff --git a/src/applications/project/controller/PhabricatorProjectColumnDetailController.php b/src/applications/project/controller/PhabricatorProjectColumnDetailController.php
diff --git a/src/applications/project/controller/PhabricatorProjectProfileController.php b/src/applications/project/controller/PhabricatorProjectProfileController.php
diff --git a/src/applications/releeph/controller/branch/ReleephBranchViewController.php b/src/applications/releeph/controller/branch/ReleephBranchViewController.php
diff --git a/src/applications/releeph/controller/product/ReleephProductViewController.php b/src/applications/releeph/controller/product/ReleephProductViewController.php
diff --git a/src/applications/spaces/controller/PhabricatorSpacesViewController.php b/src/applications/spaces/controller/PhabricatorSpacesViewController.php
diff --git a/src/view/layout/PhabricatorActionListView.php b/src/view/layout/PhabricatorActionListView.php
diff --git a/src/view/layout/PhabricatorActionView.php b/src/view/layout/PhabricatorActionView.php

Original file line number	Diff line number	Diff line change
`@@ -63,8 +63,7 @@ public function render() {`
`63`	`63`
`64`	`64`	`$actions = id(new PhabricatorActionListView())`
`65`	`65`	`->setUser($user)`
`66`		`- ->setObject($revision)`
`67`		`- ->setObjectURI($this->getURI());`
	`66`	`+ ->setObject($revision);`
`68`	`67`	`foreach ($this->getActions() as $action) {`
`69`	`68`	`$actions->addAction($action);`
`70`	`69`	`}`