Page Menu
Home
Phabricator
Search
Configure Global Search
Log In
Files
F15458558
D14805.id35799.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Size
31 KB
Referenced Files
None
Subscribers
None
D14805.id35799.diff
View Options
diff --git a/src/applications/calendar/controller/PhabricatorCalendarEventViewController.php b/src/applications/calendar/controller/PhabricatorCalendarEventViewController.php
--- a/src/applications/calendar/controller/PhabricatorCalendarEventViewController.php
+++ b/src/applications/calendar/controller/PhabricatorCalendarEventViewController.php
@@ -152,7 +152,6 @@
$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
--- a/src/applications/dashboard/controller/PhabricatorDashboardManageController.php
+++ b/src/applications/dashboard/controller/PhabricatorDashboardManageController.php
@@ -99,7 +99,6 @@
$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
--- a/src/applications/dashboard/controller/PhabricatorDashboardPanelViewController.php
+++ b/src/applications/dashboard/controller/PhabricatorDashboardPanelViewController.php
@@ -84,7 +84,6 @@
$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
--- a/src/applications/differential/view/DifferentialRevisionDetailView.php
+++ b/src/applications/differential/view/DifferentialRevisionDetailView.php
@@ -63,8 +63,7 @@
$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
--- a/src/applications/diffusion/controller/DiffusionCommitController.php
+++ b/src/applications/diffusion/controller/DiffusionCommitController.php
@@ -903,8 +903,7 @@
$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
--- a/src/applications/diffusion/controller/DiffusionRepositoryController.php
+++ b/src/applications/diffusion/controller/DiffusionRepositoryController.php
@@ -480,13 +480,11 @@
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
--- a/src/applications/diffusion/controller/DiffusionRepositoryEditMainController.php
+++ b/src/applications/diffusion/controller/DiffusionRepositoryEditMainController.php
@@ -224,7 +224,6 @@
$viewer = $this->getRequest()->getUser();
$view = id(new PhabricatorActionListView())
- ->setObjectURI($this->getRequest()->getRequestURI())
->setUser($viewer);
$edit = id(new PhabricatorActionView())
@@ -327,7 +326,6 @@
$viewer = $this->getRequest()->getUser();
$view = id(new PhabricatorActionListView())
- ->setObjectURI($this->getRequest()->getRequestURI())
->setUser($viewer);
$edit = id(new PhabricatorActionView())
@@ -364,7 +362,6 @@
$viewer = $this->getRequest()->getUser();
$view = id(new PhabricatorActionListView())
- ->setObjectURI($this->getRequest()->getRequestURI())
->setUser($viewer);
$edit = id(new PhabricatorActionView())
@@ -419,7 +416,6 @@
$viewer = $this->getRequest()->getUser();
$view = id(new PhabricatorActionListView())
- ->setObjectURI($this->getRequest()->getRequestURI())
->setUser($viewer);
$edit = id(new PhabricatorActionView())
@@ -469,7 +465,6 @@
$viewer = $this->getRequest()->getUser();
$view = id(new PhabricatorActionListView())
- ->setObjectURI($this->getRequest()->getRequestURI())
->setUser($viewer);
$edit = id(new PhabricatorActionView())
@@ -509,7 +504,6 @@
$viewer = $this->getRequest()->getUser();
$view = id(new PhabricatorActionListView())
- ->setObjectURI($this->getRequest()->getRequestURI())
->setUser($viewer);
$edit = id(new PhabricatorActionView())
@@ -551,7 +545,6 @@
$viewer = $this->getRequest()->getUser();
$view = id(new PhabricatorActionListView())
- ->setObjectURI($this->getRequest()->getRequestURI())
->setUser($viewer);
$edit = id(new PhabricatorActionView())
@@ -592,7 +585,6 @@
$viewer = $this->getRequest()->getUser();
$view = id(new PhabricatorActionListView())
- ->setObjectURI($this->getRequest()->getRequestURI())
->setUser($viewer);
$edit = id(new PhabricatorActionView())
@@ -640,7 +632,6 @@
$viewer = $this->getViewer();
$view = id(new PhabricatorActionListView())
- ->setObjectURI($this->getRequest()->getRequestURI())
->setUser($viewer);
$edit = id(new PhabricatorActionView())
@@ -678,7 +669,6 @@
$viewer = $this->getViewer();
$view = id(new PhabricatorActionListView())
- ->setObjectURI($this->getRequest()->getRequestURI())
->setUser($viewer);
$edit = id(new PhabricatorActionView())
@@ -732,7 +722,6 @@
$user = $this->getRequest()->getUser();
$view = id(new PhabricatorActionListView())
- ->setObjectURI($this->getRequest()->getRequestURI())
->setUser($user);
$edit = id(new PhabricatorActionView())
@@ -1240,7 +1229,6 @@
$viewer = $this->getRequest()->getUser();
$mirror_actions = id(new PhabricatorActionListView())
- ->setObjectURI($this->getRequest()->getRequestURI())
->setUser($viewer);
$new_mirror_uri = $this->getRepositoryControllerURI(
@@ -1319,7 +1307,6 @@
$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
--- a/src/applications/diviner/controller/DivinerBookController.php
+++ b/src/applications/diviner/controller/DivinerBookController.php
@@ -125,8 +125,7 @@
$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
--- a/src/applications/drydock/controller/DrydockAuthorizationViewController.php
+++ b/src/applications/drydock/controller/DrydockAuthorizationViewController.php
@@ -67,7 +67,6 @@
$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
--- a/src/applications/drydock/controller/DrydockBlueprintViewController.php
+++ b/src/applications/drydock/controller/DrydockBlueprintViewController.php
@@ -86,7 +86,6 @@
$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
--- a/src/applications/drydock/controller/DrydockLeaseViewController.php
+++ b/src/applications/drydock/controller/DrydockLeaseViewController.php
@@ -66,7 +66,6 @@
$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
--- a/src/applications/drydock/controller/DrydockRepositoryOperationViewController.php
+++ b/src/applications/drydock/controller/DrydockRepositoryOperationViewController.php
@@ -68,7 +68,6 @@
$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
--- a/src/applications/drydock/controller/DrydockResourceViewController.php
+++ b/src/applications/drydock/controller/DrydockResourceViewController.php
@@ -74,7 +74,6 @@
$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
--- a/src/applications/files/controller/PhabricatorFileInfoController.php
+++ b/src/applications/files/controller/PhabricatorFileInfoController.php
@@ -120,7 +120,6 @@
$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
--- a/src/applications/harbormaster/controller/HarbormasterBuildViewController.php
+++ b/src/applications/harbormaster/controller/HarbormasterBuildViewController.php
@@ -445,8 +445,7 @@
$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
--- a/src/applications/harbormaster/controller/HarbormasterBuildableViewController.php
+++ b/src/applications/harbormaster/controller/HarbormasterBuildableViewController.php
@@ -74,8 +74,7 @@
$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
--- a/src/applications/harbormaster/controller/HarbormasterPlanViewController.php
+++ b/src/applications/harbormaster/controller/HarbormasterPlanViewController.php
@@ -221,8 +221,7 @@
$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
--- a/src/applications/herald/controller/HeraldRuleViewController.php
+++ b/src/applications/herald/controller/HeraldRuleViewController.php
@@ -67,8 +67,7 @@
$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
--- a/src/applications/legalpad/controller/LegalpadDocumentManageController.php
+++ b/src/applications/legalpad/controller/LegalpadDocumentManageController.php
@@ -98,7 +98,6 @@
$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
--- a/src/applications/macro/controller/PhabricatorMacroViewController.php
+++ b/src/applications/macro/controller/PhabricatorMacroViewController.php
@@ -104,7 +104,6 @@
$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
--- a/src/applications/maniphest/controller/ManiphestTaskDetailController.php
+++ b/src/applications/maniphest/controller/ManiphestTaskDetailController.php
@@ -136,8 +136,7 @@
$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
--- a/src/applications/meta/controller/PhabricatorApplicationDetailViewController.php
+++ b/src/applications/meta/controller/PhabricatorApplicationDetailViewController.php
@@ -135,8 +135,7 @@
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
--- a/src/applications/nuance/controller/NuanceQueueViewController.php
+++ b/src/applications/nuance/controller/NuanceQueueViewController.php
@@ -59,7 +59,6 @@
$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
--- a/src/applications/nuance/controller/NuanceSourceViewController.php
+++ b/src/applications/nuance/controller/NuanceSourceViewController.php
@@ -80,7 +80,6 @@
$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
--- a/src/applications/passphrase/controller/PassphraseCredentialViewController.php
+++ b/src/applications/passphrase/controller/PassphraseCredentialViewController.php
@@ -89,7 +89,6 @@
}
$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
--- a/src/applications/paste/controller/PhabricatorPasteViewController.php
+++ b/src/applications/paste/controller/PhabricatorPasteViewController.php
@@ -131,8 +131,7 @@
$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
--- a/src/applications/people/controller/PhabricatorPeopleProfileController.php
+++ b/src/applications/people/controller/PhabricatorPeopleProfileController.php
@@ -43,7 +43,6 @@
$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
--- a/src/applications/phame/controller/blog/PhameBlogManageController.php
+++ b/src/applications/phame/controller/blog/PhameBlogManageController.php
@@ -134,7 +134,6 @@
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
--- a/src/applications/phame/controller/blog/PhameBlogViewController.php
+++ b/src/applications/phame/controller/blog/PhameBlogViewController.php
@@ -108,7 +108,6 @@
$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
--- a/src/applications/phame/controller/post/PhamePostViewController.php
+++ b/src/applications/phame/controller/post/PhamePostViewController.php
@@ -155,7 +155,6 @@
$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
--- a/src/applications/phlux/controller/PhluxViewController.php
+++ b/src/applications/phlux/controller/PhluxViewController.php
@@ -28,7 +28,6 @@
$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
--- a/src/applications/pholio/controller/PholioMockViewController.php
+++ b/src/applications/pholio/controller/PholioMockViewController.php
@@ -117,7 +117,6 @@
$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
--- a/src/applications/phortune/controller/PhortuneAccountViewController.php
+++ b/src/applications/phortune/controller/PhortuneAccountViewController.php
@@ -44,7 +44,6 @@
$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
--- a/src/applications/phortune/controller/PhortuneProductViewController.php
+++ b/src/applications/phortune/controller/PhortuneProductViewController.php
@@ -22,8 +22,7 @@
$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
--- a/src/applications/phortune/controller/PhortuneSubscriptionViewController.php
+++ b/src/applications/phortune/controller/PhortuneSubscriptionViewController.php
@@ -38,8 +38,7 @@
->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
--- a/src/applications/phragment/controller/PhragmentController.php
+++ b/src/applications/phragment/controller/PhragmentController.php
@@ -92,8 +92,7 @@
$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
--- a/src/applications/phragment/controller/PhragmentSnapshotViewController.php
+++ b/src/applications/phragment/controller/PhragmentSnapshotViewController.php
@@ -106,8 +106,7 @@
$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
--- a/src/applications/phragment/controller/PhragmentVersionController.php
+++ b/src/applications/phragment/controller/PhragmentVersionController.php
@@ -51,8 +51,7 @@
$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
--- a/src/applications/phriction/controller/PhrictionDocumentController.php
+++ b/src/applications/phriction/controller/PhrictionDocumentController.php
@@ -267,7 +267,6 @@
$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
--- a/src/applications/phurl/controller/PhabricatorPhurlURLViewController.php
+++ b/src/applications/phurl/controller/PhabricatorPhurlURLViewController.php
@@ -91,7 +91,6 @@
$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
--- a/src/applications/ponder/controller/PonderQuestionViewController.php
+++ b/src/applications/ponder/controller/PonderQuestionViewController.php
@@ -143,8 +143,7 @@
$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
--- a/src/applications/ponder/view/PonderAnswerView.php
+++ b/src/applications/ponder/view/PonderAnswerView.php
@@ -168,8 +168,7 @@
$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
--- a/src/applications/project/controller/PhabricatorProjectColumnDetailController.php
+++ b/src/applications/project/controller/PhabricatorProjectColumnDetailController.php
@@ -83,7 +83,6 @@
$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
--- a/src/applications/project/controller/PhabricatorProjectProfileController.php
+++ b/src/applications/project/controller/PhabricatorProjectProfileController.php
@@ -79,8 +79,7 @@
$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
--- a/src/applications/releeph/controller/branch/ReleephBranchViewController.php
+++ b/src/applications/releeph/controller/branch/ReleephBranchViewController.php
@@ -87,8 +87,7 @@
$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
--- a/src/applications/releeph/controller/product/ReleephProductViewController.php
+++ b/src/applications/releeph/controller/product/ReleephProductViewController.php
@@ -86,8 +86,7 @@
$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
--- a/src/applications/spaces/controller/PhabricatorSpacesViewController.php
+++ b/src/applications/spaces/controller/PhabricatorSpacesViewController.php
@@ -102,8 +102,7 @@
$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
--- a/src/view/layout/PhabricatorActionListView.php
+++ b/src/view/layout/PhabricatorActionListView.php
@@ -4,7 +4,6 @@
private $actions = array();
private $object;
- private $objectURI;
private $id = null;
public function setObject(PhabricatorLiskDAO $object) {
@@ -12,11 +11,6 @@
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 @@
}
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
--- a/src/view/layout/PhabricatorActionView.php
+++ b/src/view/layout/PhabricatorActionView.php
@@ -10,7 +10,6 @@
private $workflow;
private $renderAsForm;
private $download;
- private $objectURI;
private $sigils = array();
private $metadata;
private $selected;
@@ -34,15 +33,6 @@
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 @@
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;
}
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Tue, Apr 1, 4:46 AM (5 d, 12 h ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7226013
Default Alt Text
D14805.id35799.diff (31 KB)
Attached To
Mode
D14805: Remove all setObjectURI() from ActionListViews
Attached
Detach File
Event Timeline
Log In to Comment