@recaptime-dev's working patches + fork for Phorge, a community fork of Phabricator. (Upstream dev and stable branches are at upstream/main and upstream/stable respectively.) hq.recaptime.dev/wiki/Phorge
phorge phabricator
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Drop "-pro" suffix and "editpro" URIs for EditEngine in Maniphest

Summary: Ref T9908. Move all the "pro" stuff into the old locations.

Test Plan: Created/edited tasks, looked at URIs, saw non-pro ones. Grepped for `editpro`.

Reviewers: chad

Reviewed By: chad

Maniphest Tasks: T9908

Differential Revision: https://secure.phabricator.com/D14717

+13 -18
+2 -2
src/__phutil_library_map__.php
··· 1303 1303 'ManiphestTaskDescriptionHeraldField' => 'applications/maniphest/herald/ManiphestTaskDescriptionHeraldField.php', 1304 1304 'ManiphestTaskDetailController' => 'applications/maniphest/controller/ManiphestTaskDetailController.php', 1305 1305 'ManiphestTaskEditBulkJobType' => 'applications/maniphest/bulk/ManiphestTaskEditBulkJobType.php', 1306 - 'ManiphestTaskEditProController' => 'applications/maniphest/controller/ManiphestTaskEditProController.php', 1306 + 'ManiphestTaskEditController' => 'applications/maniphest/controller/ManiphestTaskEditController.php', 1307 1307 'ManiphestTaskHasCommitEdgeType' => 'applications/maniphest/edge/ManiphestTaskHasCommitEdgeType.php', 1308 1308 'ManiphestTaskHasMockEdgeType' => 'applications/maniphest/edge/ManiphestTaskHasMockEdgeType.php', 1309 1309 'ManiphestTaskHasRevisionEdgeType' => 'applications/maniphest/edge/ManiphestTaskHasRevisionEdgeType.php', ··· 5303 5303 'ManiphestTaskDescriptionHeraldField' => 'ManiphestTaskHeraldField', 5304 5304 'ManiphestTaskDetailController' => 'ManiphestController', 5305 5305 'ManiphestTaskEditBulkJobType' => 'PhabricatorWorkerBulkJobType', 5306 - 'ManiphestTaskEditProController' => 'ManiphestController', 5306 + 'ManiphestTaskEditController' => 'ManiphestController', 5307 5307 'ManiphestTaskHasCommitEdgeType' => 'PhabricatorEdgeType', 5308 5308 'ManiphestTaskHasMockEdgeType' => 'PhabricatorEdgeType', 5309 5309 'ManiphestTaskHasRevisionEdgeType' => 'PhabricatorEdgeType',
+1 -1
src/applications/config/controller/PhabricatorConfigWelcomeController.php
··· 265 265 266 266 267 267 $maniphest_uri = PhabricatorEnv::getURI('/maniphest/'); 268 - $maniphest_create_uri = PhabricatorEnv::getURI('/maniphest/editpro/'); 268 + $maniphest_create_uri = PhabricatorEnv::getURI('/maniphest/task/edit/'); 269 269 $maniphest_all_uri = PhabricatorEnv::getURI('/maniphest/query/all/'); 270 270 $quick[] = $this->newItem( 271 271 $request,
+2 -2
src/applications/maniphest/application/PhabricatorManiphestApplication.php
··· 54 54 '/T(?P<id>[1-9]\d*)' => 'ManiphestTaskDetailController', 55 55 '/maniphest/' => array( 56 56 '(?:query/(?P<queryKey>[^/]+)/)?' => 'ManiphestTaskListController', 57 + $this->getEditRoutePattern('edit/') 58 + => 'ManiphestTaskEditController', 57 59 'report/(?:(?P<view>\w+)/)?' => 'ManiphestReportController', 58 60 'batch/' => 'ManiphestBatchEditController', 59 61 'task/' => array( ··· 67 69 ), 68 70 'export/(?P<key>[^/]+)/' => 'ManiphestExportController', 69 71 'subpriority/' => 'ManiphestSubpriorityController', 70 - $this->getEditRoutePattern('editpro/') 71 - => 'ManiphestTaskEditProController', 72 72 ), 73 73 ); 74 74 }
+3 -3
src/applications/maniphest/controller/ManiphestTaskDetailController.php
··· 143 143 id(new PhabricatorActionView()) 144 144 ->setName(pht('Edit Task')) 145 145 ->setIcon('fa-pencil') 146 - ->setHref($this->getApplicationURI("/editpro/{$id}/")) 146 + ->setHref($this->getApplicationURI("/task/edit/{$id}/")) 147 147 ->setDisabled(!$can_edit) 148 148 ->setWorkflow(!$can_edit)); 149 149 ··· 163 163 $can_create = (bool)$edit_config; 164 164 if ($can_create) { 165 165 $form_key = $edit_config->getIdentifier(); 166 - $edit_uri = "/editpro/form/{$form_key}/?parent={$id}&template={$id}"; 166 + $edit_uri = "/task/edit/form/{$form_key}/?parent={$id}&template={$id}"; 167 167 $edit_uri = $this->getApplicationURI($edit_uri); 168 168 } else { 169 169 // TODO: This will usually give us a somewhat-reasonable error page, but 170 170 // could be a bit cleaner. 171 - $edit_uri = "/editpro/{$id}/"; 171 + $edit_uri = "/task/edit/{$id}/"; 172 172 $edit_uri = $this->getApplicationURI($edit_uri); 173 173 } 174 174
+1 -1
src/applications/maniphest/controller/ManiphestTaskEditProController.php src/applications/maniphest/controller/ManiphestTaskEditController.php
··· 1 1 <?php 2 2 3 - final class ManiphestTaskEditProController extends ManiphestController { 3 + final class ManiphestTaskEditController extends ManiphestController { 4 4 5 5 public function handleRequest(AphrontRequest $request) { 6 6 return id(new ManiphestEditEngine())
-5
src/applications/maniphest/editor/ManiphestEditEngine.php
··· 136 136 ); 137 137 } 138 138 139 - protected function getEditorURI() { 140 - // TODO: Remove when cutting over. 141 - return $this->getApplication()->getApplicationURI('editpro/'); 142 - } 143 - 144 139 private function getTaskStatusMap(ManiphestTask $task) { 145 140 $status_map = ManiphestTaskStatus::getTaskStatusMap(); 146 141
+1 -1
src/applications/maniphest/view/ManiphestTaskListView.php
··· 111 111 )); 112 112 113 113 if ($this->showBatchControls) { 114 - $href = new PhutilURI('/maniphest/editpro/'.$task->getID().'/'); 114 + $href = new PhutilURI('/maniphest/task/edit/'.$task->getID().'/'); 115 115 if (!$this->showSubpriorityControls) { 116 116 $href->setQueryParam('ungrippable', 'true'); 117 117 }
+2 -2
src/applications/project/controller/PhabricatorProjectBoardViewController.php
··· 778 778 ->loadDefaultEditConfiguration(); 779 779 if ($edit_config) { 780 780 $form_key = $edit_config->getIdentifier(); 781 - $create_uri = "/maniphest/editpro/form/{$form_key}/"; 781 + $create_uri = "/maniphest/task/edit/form/{$form_key}/"; 782 782 } else { 783 - $create_uri = '/maniphest/editpro/'; 783 + $create_uri = '/maniphest/task/edit/'; 784 784 } 785 785 786 786 return $create_uri;
+1 -1
src/applications/project/view/ProjectBoardTaskCard.php
··· 66 66 ->setName(pht('Edit')) 67 67 ->setIcon('fa-pencil') 68 68 ->addSigil('edit-project-card') 69 - ->setHref('/maniphest/editpro/'.$task->getID().'/')) 69 + ->setHref('/maniphest/task/edit/'.$task->getID().'/')) 70 70 ->setBarColor($bar_color); 71 71 72 72 if ($owner) {