diff --git a/src/applications/calendar/controller/PhabricatorCalendarEventViewController.php b/src/applications/calendar/controller/PhabricatorCalendarEventViewController.php index d6a37651e6..43386fe0d6 100644 --- a/src/applications/calendar/controller/PhabricatorCalendarEventViewController.php +++ b/src/applications/calendar/controller/PhabricatorCalendarEventViewController.php @@ -152,7 +152,6 @@ final class PhabricatorCalendarEventViewController $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 index a264859645..6600ad0d34 100644 --- a/src/applications/dashboard/controller/PhabricatorDashboardManageController.php +++ b/src/applications/dashboard/controller/PhabricatorDashboardManageController.php @@ -99,7 +99,6 @@ final class PhabricatorDashboardManageController $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 index f22b60ca75..bc13374596 100644 --- a/src/applications/dashboard/controller/PhabricatorDashboardPanelViewController.php +++ b/src/applications/dashboard/controller/PhabricatorDashboardPanelViewController.php @@ -84,7 +84,6 @@ final class PhabricatorDashboardPanelViewController $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 index 493691d21a..a8436811c2 100644 --- a/src/applications/differential/view/DifferentialRevisionDetailView.php +++ b/src/applications/differential/view/DifferentialRevisionDetailView.php @@ -63,8 +63,7 @@ final class DifferentialRevisionDetailView extends AphrontView { $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 index a698eba5c0..6f1dbf26ac 100644 --- a/src/applications/diffusion/controller/DiffusionCommitController.php +++ b/src/applications/diffusion/controller/DiffusionCommitController.php @@ -903,8 +903,7 @@ final class DiffusionCommitController extends DiffusionController { $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 index cfa4f8f0d6..cd7859cc0a 100644 --- a/src/applications/diffusion/controller/DiffusionRepositoryController.php +++ b/src/applications/diffusion/controller/DiffusionRepositoryController.php @@ -480,13 +480,11 @@ final class DiffusionRepositoryController extends DiffusionController { 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 index f18ffe4163..780e83d089 100644 --- a/src/applications/diffusion/controller/DiffusionRepositoryEditMainController.php +++ b/src/applications/diffusion/controller/DiffusionRepositoryEditMainController.php @@ -224,7 +224,6 @@ final class DiffusionRepositoryEditMainController $viewer = $this->getRequest()->getUser(); $view = id(new PhabricatorActionListView()) - ->setObjectURI($this->getRequest()->getRequestURI()) ->setUser($viewer); $edit = id(new PhabricatorActionView()) @@ -327,7 +326,6 @@ final class DiffusionRepositoryEditMainController $viewer = $this->getRequest()->getUser(); $view = id(new PhabricatorActionListView()) - ->setObjectURI($this->getRequest()->getRequestURI()) ->setUser($viewer); $edit = id(new PhabricatorActionView()) @@ -364,7 +362,6 @@ final class DiffusionRepositoryEditMainController $viewer = $this->getRequest()->getUser(); $view = id(new PhabricatorActionListView()) - ->setObjectURI($this->getRequest()->getRequestURI()) ->setUser($viewer); $edit = id(new PhabricatorActionView()) @@ -419,7 +416,6 @@ final class DiffusionRepositoryEditMainController $viewer = $this->getRequest()->getUser(); $view = id(new PhabricatorActionListView()) - ->setObjectURI($this->getRequest()->getRequestURI()) ->setUser($viewer); $edit = id(new PhabricatorActionView()) @@ -469,7 +465,6 @@ final class DiffusionRepositoryEditMainController $viewer = $this->getRequest()->getUser(); $view = id(new PhabricatorActionListView()) - ->setObjectURI($this->getRequest()->getRequestURI()) ->setUser($viewer); $edit = id(new PhabricatorActionView()) @@ -509,7 +504,6 @@ final class DiffusionRepositoryEditMainController $viewer = $this->getRequest()->getUser(); $view = id(new PhabricatorActionListView()) - ->setObjectURI($this->getRequest()->getRequestURI()) ->setUser($viewer); $edit = id(new PhabricatorActionView()) @@ -551,7 +545,6 @@ final class DiffusionRepositoryEditMainController $viewer = $this->getRequest()->getUser(); $view = id(new PhabricatorActionListView()) - ->setObjectURI($this->getRequest()->getRequestURI()) ->setUser($viewer); $edit = id(new PhabricatorActionView()) @@ -592,7 +585,6 @@ final class DiffusionRepositoryEditMainController $viewer = $this->getRequest()->getUser(); $view = id(new PhabricatorActionListView()) - ->setObjectURI($this->getRequest()->getRequestURI()) ->setUser($viewer); $edit = id(new PhabricatorActionView()) @@ -640,7 +632,6 @@ final class DiffusionRepositoryEditMainController $viewer = $this->getViewer(); $view = id(new PhabricatorActionListView()) - ->setObjectURI($this->getRequest()->getRequestURI()) ->setUser($viewer); $edit = id(new PhabricatorActionView()) @@ -678,7 +669,6 @@ final class DiffusionRepositoryEditMainController $viewer = $this->getViewer(); $view = id(new PhabricatorActionListView()) - ->setObjectURI($this->getRequest()->getRequestURI()) ->setUser($viewer); $edit = id(new PhabricatorActionView()) @@ -732,7 +722,6 @@ final class DiffusionRepositoryEditMainController $user = $this->getRequest()->getUser(); $view = id(new PhabricatorActionListView()) - ->setObjectURI($this->getRequest()->getRequestURI()) ->setUser($user); $edit = id(new PhabricatorActionView()) @@ -1240,7 +1229,6 @@ final class DiffusionRepositoryEditMainController $viewer = $this->getRequest()->getUser(); $mirror_actions = id(new PhabricatorActionListView()) - ->setObjectURI($this->getRequest()->getRequestURI()) ->setUser($viewer); $new_mirror_uri = $this->getRepositoryControllerURI( @@ -1319,7 +1307,6 @@ final class DiffusionRepositoryEditMainController $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 index 38e6cc3767..ebaf559775 100644 --- a/src/applications/diviner/controller/DivinerBookController.php +++ b/src/applications/diviner/controller/DivinerBookController.php @@ -125,8 +125,7 @@ final class DivinerBookController extends DivinerController { $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 index 3609b95f9f..bc34154e4f 100644 --- a/src/applications/drydock/controller/DrydockAuthorizationViewController.php +++ b/src/applications/drydock/controller/DrydockAuthorizationViewController.php @@ -67,7 +67,6 @@ final class DrydockAuthorizationViewController $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 index f90dcb9d82..2566c69840 100644 --- a/src/applications/drydock/controller/DrydockBlueprintViewController.php +++ b/src/applications/drydock/controller/DrydockBlueprintViewController.php @@ -86,7 +86,6 @@ final class DrydockBlueprintViewController extends DrydockBlueprintController { $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 index 0b5eae3e12..088b197a5f 100644 --- a/src/applications/drydock/controller/DrydockLeaseViewController.php +++ b/src/applications/drydock/controller/DrydockLeaseViewController.php @@ -66,7 +66,6 @@ final class DrydockLeaseViewController extends DrydockLeaseController { $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 index e43ffbd367..1430c326c4 100644 --- a/src/applications/drydock/controller/DrydockRepositoryOperationViewController.php +++ b/src/applications/drydock/controller/DrydockRepositoryOperationViewController.php @@ -68,7 +68,6 @@ final class DrydockRepositoryOperationViewController $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 index 71e4a09db1..d392796f57 100644 --- a/src/applications/drydock/controller/DrydockResourceViewController.php +++ b/src/applications/drydock/controller/DrydockResourceViewController.php @@ -74,7 +74,6 @@ final class DrydockResourceViewController extends DrydockResourceController { $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 index d9b5de14ee..2731b7f4bb 100644 --- a/src/applications/files/controller/PhabricatorFileInfoController.php +++ b/src/applications/files/controller/PhabricatorFileInfoController.php @@ -120,7 +120,6 @@ final class PhabricatorFileInfoController extends PhabricatorFileController { $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 index 363a05776e..d197174175 100644 --- a/src/applications/harbormaster/controller/HarbormasterBuildViewController.php +++ b/src/applications/harbormaster/controller/HarbormasterBuildViewController.php @@ -445,8 +445,7 @@ final class HarbormasterBuildViewController $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 index e57c322be4..300cb79f23 100644 --- a/src/applications/harbormaster/controller/HarbormasterBuildableViewController.php +++ b/src/applications/harbormaster/controller/HarbormasterBuildableViewController.php @@ -74,8 +74,7 @@ final class HarbormasterBuildableViewController $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 index ef8f98bdb2..e306eaef7c 100644 --- a/src/applications/harbormaster/controller/HarbormasterPlanViewController.php +++ b/src/applications/harbormaster/controller/HarbormasterPlanViewController.php @@ -221,8 +221,7 @@ final class HarbormasterPlanViewController extends HarbormasterPlanController { $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 index c8e0442dc5..3b209dd960 100644 --- a/src/applications/herald/controller/HeraldRuleViewController.php +++ b/src/applications/herald/controller/HeraldRuleViewController.php @@ -67,8 +67,7 @@ final class HeraldRuleViewController extends HeraldController { $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 index 1ca838258b..baeefeaf4b 100644 --- a/src/applications/legalpad/controller/LegalpadDocumentManageController.php +++ b/src/applications/legalpad/controller/LegalpadDocumentManageController.php @@ -98,7 +98,6 @@ final class LegalpadDocumentManageController extends LegalpadController { $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 index 02a6f0d342..fb6db3cf07 100644 --- a/src/applications/macro/controller/PhabricatorMacroViewController.php +++ b/src/applications/macro/controller/PhabricatorMacroViewController.php @@ -104,7 +104,6 @@ final class PhabricatorMacroViewController $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 index a7e64f04d1..e5e5083664 100644 --- a/src/applications/maniphest/controller/ManiphestTaskDetailController.php +++ b/src/applications/maniphest/controller/ManiphestTaskDetailController.php @@ -136,8 +136,7 @@ final class ManiphestTaskDetailController extends ManiphestController { $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 index 702d0b2130..0ef4b83abd 100644 --- a/src/applications/meta/controller/PhabricatorApplicationDetailViewController.php +++ b/src/applications/meta/controller/PhabricatorApplicationDetailViewController.php @@ -135,8 +135,7 @@ final class PhabricatorApplicationDetailViewController 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 index d619cfb946..71e5e04ce7 100644 --- a/src/applications/nuance/controller/NuanceQueueViewController.php +++ b/src/applications/nuance/controller/NuanceQueueViewController.php @@ -59,7 +59,6 @@ final class NuanceQueueViewController extends NuanceController { $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 index 7b8d9e8251..78d6949455 100644 --- a/src/applications/nuance/controller/NuanceSourceViewController.php +++ b/src/applications/nuance/controller/NuanceSourceViewController.php @@ -80,7 +80,6 @@ final class NuanceSourceViewController extends NuanceController { $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 index 46ae06cdc7..c156be81ce 100644 --- a/src/applications/passphrase/controller/PassphraseCredentialViewController.php +++ b/src/applications/passphrase/controller/PassphraseCredentialViewController.php @@ -89,7 +89,6 @@ final class PassphraseCredentialViewController extends PassphraseController { } $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 index 33766958d9..530b2245c5 100644 --- a/src/applications/paste/controller/PhabricatorPasteViewController.php +++ b/src/applications/paste/controller/PhabricatorPasteViewController.php @@ -131,8 +131,7 @@ final class PhabricatorPasteViewController extends PhabricatorPasteController { $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 index b61d93f0e2..a4378f380c 100644 --- a/src/applications/people/controller/PhabricatorPeopleProfileController.php +++ b/src/applications/people/controller/PhabricatorPeopleProfileController.php @@ -43,7 +43,6 @@ final class PhabricatorPeopleProfileController $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 index 36cf7a4ddb..0402245d41 100644 --- a/src/applications/phame/controller/blog/PhameBlogManageController.php +++ b/src/applications/phame/controller/blog/PhameBlogManageController.php @@ -134,7 +134,6 @@ final class PhameBlogManageController extends PhameBlogController { 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 index 6c5836e997..dd963a327b 100644 --- a/src/applications/phame/controller/blog/PhameBlogViewController.php +++ b/src/applications/phame/controller/blog/PhameBlogViewController.php @@ -108,7 +108,6 @@ final class PhameBlogViewController extends PhameLiveController { $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 index f49bd0e727..240f8f3a69 100644 --- a/src/applications/phame/controller/post/PhamePostViewController.php +++ b/src/applications/phame/controller/post/PhamePostViewController.php @@ -155,7 +155,6 @@ final class PhamePostViewController $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 index f45154a158..384e15b57e 100644 --- a/src/applications/phlux/controller/PhluxViewController.php +++ b/src/applications/phlux/controller/PhluxViewController.php @@ -28,7 +28,6 @@ final class PhluxViewController extends PhluxController { $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 index bd6573e7d4..78c1d4bfe9 100644 --- a/src/applications/pholio/controller/PholioMockViewController.php +++ b/src/applications/pholio/controller/PholioMockViewController.php @@ -117,7 +117,6 @@ final class PholioMockViewController extends PholioController { $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 index 7199b37799..f4791d8bb6 100644 --- a/src/applications/phortune/controller/PhortuneAccountViewController.php +++ b/src/applications/phortune/controller/PhortuneAccountViewController.php @@ -44,7 +44,6 @@ final class PhortuneAccountViewController extends PhortuneController { $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 index 73d120bfd9..56bf0736d3 100644 --- a/src/applications/phortune/controller/PhortuneProductViewController.php +++ b/src/applications/phortune/controller/PhortuneProductViewController.php @@ -22,8 +22,7 @@ final class PhortuneProductViewController extends PhortuneController { $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 index ad4d366d15..8804499056 100644 --- a/src/applications/phortune/controller/PhortuneSubscriptionViewController.php +++ b/src/applications/phortune/controller/PhortuneSubscriptionViewController.php @@ -38,8 +38,7 @@ final class PhortuneSubscriptionViewController extends PhortuneController { ->setHeader($title); $actions = id(new PhabricatorActionListView()) - ->setUser($viewer) - ->setObjectURI($request->getRequestURI()); + ->setUser($viewer); $edit_uri = $subscription->getEditURI(); diff --git a/src/applications/phragment/controller/PhragmentController.php b/src/applications/phragment/controller/PhragmentController.php index c08adcecc6..f9df7429be 100644 --- a/src/applications/phragment/controller/PhragmentController.php +++ b/src/applications/phragment/controller/PhragmentController.php @@ -92,8 +92,7 @@ abstract class PhragmentController extends PhabricatorController { $actions = id(new PhabricatorActionListView()) ->setUser($viewer) - ->setObject($fragment) - ->setObjectURI($fragment->getURI()); + ->setObject($fragment); $actions->addAction( id(new PhabricatorActionView()) ->setName(pht('Download Fragment')) diff --git a/src/applications/phragment/controller/PhragmentSnapshotViewController.php b/src/applications/phragment/controller/PhragmentSnapshotViewController.php index 545e8806eb..fe499fffa1 100644 --- a/src/applications/phragment/controller/PhragmentSnapshotViewController.php +++ b/src/applications/phragment/controller/PhragmentSnapshotViewController.php @@ -106,8 +106,7 @@ final class PhragmentSnapshotViewController extends PhragmentController { $actions = id(new PhabricatorActionListView()) ->setUser($viewer) - ->setObject($snapshot) - ->setObjectURI($snapshot->getURI()); + ->setObject($snapshot); $actions->addAction( id(new PhabricatorActionView()) ->setName(pht('Download Snapshot as ZIP')) diff --git a/src/applications/phragment/controller/PhragmentVersionController.php b/src/applications/phragment/controller/PhragmentVersionController.php index e2906a7454..29b920a4e5 100644 --- a/src/applications/phragment/controller/PhragmentVersionController.php +++ b/src/applications/phragment/controller/PhragmentVersionController.php @@ -51,8 +51,7 @@ final class PhragmentVersionController extends PhragmentController { $actions = id(new PhabricatorActionListView()) ->setUser($viewer) - ->setObject($version) - ->setObjectURI($version->getURI()); + ->setObject($version); $actions->addAction( id(new PhabricatorActionView()) ->setName(pht('Download Version')) diff --git a/src/applications/phriction/controller/PhrictionDocumentController.php b/src/applications/phriction/controller/PhrictionDocumentController.php index a6d88df341..49e7f29bff 100644 --- a/src/applications/phriction/controller/PhrictionDocumentController.php +++ b/src/applications/phriction/controller/PhrictionDocumentController.php @@ -267,7 +267,6 @@ final class PhrictionDocumentController $action_view = id(new PhabricatorActionListView()) ->setUser($viewer) - ->setObjectURI($this->getRequest()->getRequestURI()) ->setObject($document); if (!$document->getID()) { diff --git a/src/applications/phurl/controller/PhabricatorPhurlURLViewController.php b/src/applications/phurl/controller/PhabricatorPhurlURLViewController.php index 014d0eefef..51abcd8059 100644 --- a/src/applications/phurl/controller/PhabricatorPhurlURLViewController.php +++ b/src/applications/phurl/controller/PhabricatorPhurlURLViewController.php @@ -91,7 +91,6 @@ final class PhabricatorPhurlURLViewController $id = $url->getID(); $actions = id(new PhabricatorActionListView()) - ->setObjectURI($url->getURI()) ->setUser($viewer) ->setObject($url); diff --git a/src/applications/ponder/controller/PonderQuestionViewController.php b/src/applications/ponder/controller/PonderQuestionViewController.php index 0e92f8e90c..2ec911bdde 100644 --- a/src/applications/ponder/controller/PonderQuestionViewController.php +++ b/src/applications/ponder/controller/PonderQuestionViewController.php @@ -143,8 +143,7 @@ final class PonderQuestionViewController extends PonderController { $view = id(new PhabricatorActionListView()) ->setUser($viewer) - ->setObject($question) - ->setObjectURI($request->getRequestURI()); + ->setObject($question); $view->addAction( id(new PhabricatorActionView()) diff --git a/src/applications/ponder/view/PonderAnswerView.php b/src/applications/ponder/view/PonderAnswerView.php index 6f4bba539c..3951aa84a7 100644 --- a/src/applications/ponder/view/PonderAnswerView.php +++ b/src/applications/ponder/view/PonderAnswerView.php @@ -168,8 +168,7 @@ final class PonderAnswerView extends AphrontTagView { $view = id(new PhabricatorActionListView()) ->setUser($viewer) - ->setObject($answer) - ->setObjectURI('Q'.$answer->getQuestionID()); + ->setObject($answer); $user_marked = $answer->getUserVote(); $can_vote = $viewer->isLoggedIn(); diff --git a/src/applications/project/controller/PhabricatorProjectColumnDetailController.php b/src/applications/project/controller/PhabricatorProjectColumnDetailController.php index bf0b659859..01b520c6c3 100644 --- a/src/applications/project/controller/PhabricatorProjectColumnDetailController.php +++ b/src/applications/project/controller/PhabricatorProjectColumnDetailController.php @@ -83,7 +83,6 @@ final class PhabricatorProjectColumnDetailController $base_uri = '/board/'.$project_id.'/'; $actions = id(new PhabricatorActionListView()) - ->setObjectURI($this->getApplicationURI($base_uri.'column/'.$id.'/')) ->setUser($viewer); $can_edit = PhabricatorPolicyFilter::hasCapability( diff --git a/src/applications/project/controller/PhabricatorProjectProfileController.php b/src/applications/project/controller/PhabricatorProjectProfileController.php index 2420297c2f..e45da78fc8 100644 --- a/src/applications/project/controller/PhabricatorProjectProfileController.php +++ b/src/applications/project/controller/PhabricatorProjectProfileController.php @@ -79,8 +79,7 @@ final class PhabricatorProjectProfileController $view = id(new PhabricatorActionListView()) ->setUser($viewer) - ->setObject($project) - ->setObjectURI($request->getRequestURI()); + ->setObject($project); $can_edit = PhabricatorPolicyFilter::hasCapability( $viewer, diff --git a/src/applications/releeph/controller/branch/ReleephBranchViewController.php b/src/applications/releeph/controller/branch/ReleephBranchViewController.php index 11615fe3ed..cb4c3ed297 100644 --- a/src/applications/releeph/controller/branch/ReleephBranchViewController.php +++ b/src/applications/releeph/controller/branch/ReleephBranchViewController.php @@ -87,8 +87,7 @@ final class ReleephBranchViewController extends ReleephBranchController { $actions = id(new PhabricatorActionListView()) ->setUser($viewer) - ->setObject($branch) - ->setObjectURI($this->getRequest()->getRequestURI()); + ->setObject($branch); $can_edit = PhabricatorPolicyFilter::hasCapability( $viewer, diff --git a/src/applications/releeph/controller/product/ReleephProductViewController.php b/src/applications/releeph/controller/product/ReleephProductViewController.php index e35497eec7..963710c3ec 100644 --- a/src/applications/releeph/controller/product/ReleephProductViewController.php +++ b/src/applications/releeph/controller/product/ReleephProductViewController.php @@ -86,8 +86,7 @@ final class ReleephProductViewController extends ReleephProductController { $actions = id(new PhabricatorActionListView()) ->setUser($viewer) - ->setObject($product) - ->setObjectURI($this->getRequest()->getRequestURI()); + ->setObject($product); $can_edit = PhabricatorPolicyFilter::hasCapability( $viewer, diff --git a/src/applications/spaces/controller/PhabricatorSpacesViewController.php b/src/applications/spaces/controller/PhabricatorSpacesViewController.php index 511d853151..7515b4dcc2 100644 --- a/src/applications/spaces/controller/PhabricatorSpacesViewController.php +++ b/src/applications/spaces/controller/PhabricatorSpacesViewController.php @@ -102,8 +102,7 @@ final class PhabricatorSpacesViewController $viewer = $this->getRequest()->getUser(); $list = id(new PhabricatorActionListView()) - ->setUser($viewer) - ->setObjectURI('/'.$space->getMonogram()); + ->setUser($viewer); $can_edit = PhabricatorPolicyFilter::hasCapability( $viewer, diff --git a/src/view/layout/PhabricatorActionListView.php b/src/view/layout/PhabricatorActionListView.php index 82449951d7..6c343af4fe 100644 --- a/src/view/layout/PhabricatorActionListView.php +++ b/src/view/layout/PhabricatorActionListView.php @@ -4,7 +4,6 @@ final class PhabricatorActionListView extends AphrontView { private $actions = array(); private $object; - private $objectURI; private $id = null; public function setObject(PhabricatorLiskDAO $object) { @@ -12,11 +11,6 @@ final class PhabricatorActionListView extends AphrontView { return $this; } - public function setObjectURI($uri) { - $this->objectURI = $uri; - return $this; - } - public function addAction(PhabricatorActionView $view) { $this->actions[] = $view; return $this; @@ -47,7 +41,6 @@ final class PhabricatorActionListView extends AphrontView { } foreach ($actions as $action) { - $action->setObjectURI($this->objectURI); $action->setUser($this->user); } diff --git a/src/view/layout/PhabricatorActionView.php b/src/view/layout/PhabricatorActionView.php index 8c56f66968..15ff0a0023 100644 --- a/src/view/layout/PhabricatorActionView.php +++ b/src/view/layout/PhabricatorActionView.php @@ -10,7 +10,6 @@ final class PhabricatorActionView extends AphrontView { private $workflow; private $renderAsForm; private $download; - private $objectURI; private $sigils = array(); private $metadata; private $selected; @@ -34,15 +33,6 @@ final class PhabricatorActionView extends AphrontView { return $this->metadata; } - public function setObjectURI($object_uri) { - $this->objectURI = $object_uri; - return $this; - } - - public function getObjectURI() { - return $this->objectURI; - } - public function setDownload($download) { $this->download = $download; return $this; @@ -62,19 +52,7 @@ final class PhabricatorActionView extends AphrontView { return $this; } - /** - * If the user is not logged in and the action is relatively complicated, - * give them a generic login link that will re-direct to the page they're - * viewing. - */ public function getHref() { - if (($this->workflow || $this->renderAsForm) && !$this->download) { - if (!$this->user || !$this->user->isLoggedIn()) { - return id(new PhutilURI('/auth/start/')) - ->setQueryParam('next', (string)$this->getObjectURI()); - } - } - return $this->href; }