+12 -4

src/__phutil_library_map__.php

reviewed

··· 350 350 'DefaultDatabaseConfigurationProvider' => 'infrastructure/storage/configuration/DefaultDatabaseConfigurationProvider.php', 351 351 'DifferentialAction' => 'applications/differential/constants/DifferentialAction.php', 352 352 'DifferentialActionEmailCommand' => 'applications/differential/command/DifferentialActionEmailCommand.php', 353 353 - 'DifferentialActionMenuEventListener' => 'applications/differential/event/DifferentialActionMenuEventListener.php', 354 353 'DifferentialAddCommentView' => 'applications/differential/view/DifferentialAddCommentView.php', 355 354 'DifferentialAdjustmentMapTestCase' => 'applications/differential/storage/__tests__/DifferentialAdjustmentMapTestCase.php', 356 355 'DifferentialAffectedPath' => 'applications/differential/storage/DifferentialAffectedPath.php', ··· 1420 1419 'ManiphestTaskEditController' => 'applications/maniphest/controller/ManiphestTaskEditController.php', 1421 1420 'ManiphestTaskFulltextEngine' => 'applications/maniphest/search/ManiphestTaskFulltextEngine.php', 1422 1421 'ManiphestTaskHasCommitEdgeType' => 'applications/maniphest/edge/ManiphestTaskHasCommitEdgeType.php', 1422 1422 + 'ManiphestTaskHasCommitRelationship' => 'applications/maniphest/relationship/ManiphestTaskHasCommitRelationship.php', 1423 1423 'ManiphestTaskHasMockEdgeType' => 'applications/maniphest/edge/ManiphestTaskHasMockEdgeType.php', 1424 1424 + 'ManiphestTaskHasMockRelationship' => 'applications/maniphest/relationship/ManiphestTaskHasMockRelationship.php', 1424 1425 'ManiphestTaskHasRevisionEdgeType' => 'applications/maniphest/edge/ManiphestTaskHasRevisionEdgeType.php', 1426 1426 + 'ManiphestTaskHasRevisionRelationship' => 'applications/maniphest/relationship/ManiphestTaskHasRevisionRelationship.php', 1425 1427 'ManiphestTaskHeraldField' => 'applications/maniphest/herald/ManiphestTaskHeraldField.php', 1426 1428 'ManiphestTaskHeraldFieldGroup' => 'applications/maniphest/herald/ManiphestTaskHeraldFieldGroup.php', 1427 1429 'ManiphestTaskListController' => 'applications/maniphest/controller/ManiphestTaskListController.php', ··· 1437 1439 'ManiphestTaskPriorityHeraldAction' => 'applications/maniphest/herald/ManiphestTaskPriorityHeraldAction.php', 1438 1440 'ManiphestTaskPriorityHeraldField' => 'applications/maniphest/herald/ManiphestTaskPriorityHeraldField.php', 1439 1441 'ManiphestTaskQuery' => 'applications/maniphest/query/ManiphestTaskQuery.php', 1442 1442 + 'ManiphestTaskRelationship' => 'applications/maniphest/relationship/ManiphestTaskRelationship.php', 1440 1443 'ManiphestTaskResultListView' => 'applications/maniphest/view/ManiphestTaskResultListView.php', 1441 1444 'ManiphestTaskSearchEngine' => 'applications/maniphest/query/ManiphestTaskSearchEngine.php', 1442 1445 'ManiphestTaskStatus' => 'applications/maniphest/constants/ManiphestTaskStatus.php', ··· 2860 2863 'PhabricatorObjectMentionedByObjectEdgeType' => 'applications/transactions/edges/PhabricatorObjectMentionedByObjectEdgeType.php', 2861 2864 'PhabricatorObjectMentionsObjectEdgeType' => 'applications/transactions/edges/PhabricatorObjectMentionsObjectEdgeType.php', 2862 2865 'PhabricatorObjectQuery' => 'applications/phid/query/PhabricatorObjectQuery.php', 2866 2866 + 'PhabricatorObjectRelationship' => 'applications/search/relationship/PhabricatorObjectRelationship.php', 2867 2867 + 'PhabricatorObjectRelationshipList' => 'applications/search/relationship/PhabricatorObjectRelationshipList.php', 2863 2868 'PhabricatorObjectRemarkupRule' => 'infrastructure/markup/rule/PhabricatorObjectRemarkupRule.php', 2864 2869 'PhabricatorObjectSelectorDialog' => 'view/control/PhabricatorObjectSelectorDialog.php', 2865 2870 'PhabricatorOffsetPagedQuery' => 'infrastructure/query/PhabricatorOffsetPagedQuery.php', ··· 3834 3839 'PhluxVariablePHIDType' => 'applications/phlux/phid/PhluxVariablePHIDType.php', 3835 3840 'PhluxVariableQuery' => 'applications/phlux/query/PhluxVariableQuery.php', 3836 3841 'PhluxViewController' => 'applications/phlux/controller/PhluxViewController.php', 3837 3837 - 'PholioActionMenuEventListener' => 'applications/pholio/event/PholioActionMenuEventListener.php', 3838 3842 'PholioController' => 'applications/pholio/controller/PholioController.php', 3839 3843 'PholioDAO' => 'applications/pholio/storage/PholioDAO.php', 3840 3844 'PholioDefaultEditCapability' => 'applications/pholio/capability/PholioDefaultEditCapability.php', ··· 4662 4666 ), 4663 4667 'DifferentialAction' => 'Phobject', 4664 4668 'DifferentialActionEmailCommand' => 'MetaMTAEmailTransactionCommand', 4665 4665 - 'DifferentialActionMenuEventListener' => 'PhabricatorEventListener', 4666 4669 'DifferentialAddCommentView' => 'AphrontView', 4667 4670 'DifferentialAdjustmentMapTestCase' => 'PhutilTestCase', 4668 4671 'DifferentialAffectedPath' => 'DifferentialDAO', ··· 5906 5909 'ManiphestTaskEditController' => 'ManiphestController', 5907 5910 'ManiphestTaskFulltextEngine' => 'PhabricatorFulltextEngine', 5908 5911 'ManiphestTaskHasCommitEdgeType' => 'PhabricatorEdgeType', 5912 5912 + 'ManiphestTaskHasCommitRelationship' => 'ManiphestTaskRelationship', 5909 5913 'ManiphestTaskHasMockEdgeType' => 'PhabricatorEdgeType', 5914 5914 + 'ManiphestTaskHasMockRelationship' => 'ManiphestTaskRelationship', 5910 5915 'ManiphestTaskHasRevisionEdgeType' => 'PhabricatorEdgeType', 5916 5916 + 'ManiphestTaskHasRevisionRelationship' => 'ManiphestTaskRelationship', 5911 5917 'ManiphestTaskHeraldField' => 'HeraldField', 5912 5918 'ManiphestTaskHeraldFieldGroup' => 'HeraldFieldGroup', 5913 5919 'ManiphestTaskListController' => 'ManiphestController', ··· 5923 5929 'ManiphestTaskPriorityHeraldAction' => 'HeraldAction', 5924 5930 'ManiphestTaskPriorityHeraldField' => 'ManiphestTaskHeraldField', 5925 5931 'ManiphestTaskQuery' => 'PhabricatorCursorPagedPolicyAwareQuery', 5932 5932 + 'ManiphestTaskRelationship' => 'PhabricatorObjectRelationship', 5926 5933 'ManiphestTaskResultListView' => 'ManiphestView', 5927 5934 'ManiphestTaskSearchEngine' => 'PhabricatorApplicationSearchEngine', 5928 5935 'ManiphestTaskStatus' => 'ManiphestConstants', ··· 7547 7554 'PhabricatorObjectMentionedByObjectEdgeType' => 'PhabricatorEdgeType', 7548 7555 'PhabricatorObjectMentionsObjectEdgeType' => 'PhabricatorEdgeType', 7549 7556 'PhabricatorObjectQuery' => 'PhabricatorCursorPagedPolicyAwareQuery', 7557 7557 + 'PhabricatorObjectRelationship' => 'Phobject', 7558 7558 + 'PhabricatorObjectRelationshipList' => 'Phobject', 7550 7559 'PhabricatorObjectRemarkupRule' => 'PhutilRemarkupRule', 7551 7560 'PhabricatorObjectSelectorDialog' => 'Phobject', 7552 7561 'PhabricatorOffsetPagedQuery' => 'PhabricatorQuery', ··· 8730 8739 'PhluxVariablePHIDType' => 'PhabricatorPHIDType', 8731 8740 'PhluxVariableQuery' => 'PhabricatorCursorPagedPolicyAwareQuery', 8732 8741 'PhluxViewController' => 'PhluxController', 8733 8733 - 'PholioActionMenuEventListener' => 'PhabricatorEventListener', 8734 8742 'PholioController' => 'PhabricatorController', 8735 8743 'PholioDAO' => 'PhabricatorLiskDAO', 8736 8744 'PholioDefaultEditCapability' => 'PhabricatorPolicyCapability',

-1

src/applications/differential/application/PhabricatorDifferentialApplication.php

reviewed

··· 43 43 44 44 public function getEventListeners() { 45 45 return array( 46 46 - new DifferentialActionMenuEventListener(), 47 46 new DifferentialLandingActionMenuEventListener(), 48 47 ); 49 48 }

-50

src/applications/differential/event/DifferentialActionMenuEventListener.php

reviewed

··· 1 1 - <?php 2 2 - 3 3 - final class DifferentialActionMenuEventListener 4 4 - extends PhabricatorEventListener { 5 5 - 6 6 - public function register() { 7 7 - $this->listen(PhabricatorEventType::TYPE_UI_DIDRENDERACTIONS); 8 8 - } 9 9 - 10 10 - public function handleEvent(PhutilEvent $event) { 11 11 - switch ($event->getType()) { 12 12 - case PhabricatorEventType::TYPE_UI_DIDRENDERACTIONS: 13 13 - $this->handleActionsEvent($event); 14 14 - break; 15 15 - } 16 16 - } 17 17 - 18 18 - private function handleActionsEvent(PhutilEvent $event) { 19 19 - $object = $event->getValue('object'); 20 20 - 21 21 - $actions = null; 22 22 - if ($object instanceof ManiphestTask) { 23 23 - $actions = $this->renderTaskItems($event); 24 24 - $this->addActionMenuItems($event, $actions); 25 25 - } 26 26 - 27 27 - } 28 28 - 29 29 - private function renderTaskItems(PhutilEvent $event) { 30 30 - if (!$this->canUseApplication($event->getUser())) { 31 31 - return null; 32 32 - } 33 33 - 34 34 - $task = $event->getValue('object'); 35 35 - $phid = $task->getPHID(); 36 36 - 37 37 - $can_edit = PhabricatorPolicyFilter::hasCapability( 38 38 - $event->getUser(), 39 39 - $task, 40 40 - PhabricatorPolicyCapability::CAN_EDIT); 41 41 - 42 42 - return id(new PhabricatorActionView()) 43 43 - ->setName(pht('Edit Differential Revisions')) 44 44 - ->setHref("/search/attach/{$phid}/DREV/") 45 45 - ->setIcon('fa-cog') 46 46 - ->setDisabled(!$can_edit) 47 47 - ->setWorkflow(true); 48 48 - } 49 49 - 50 50 - }

+9

src/applications/maniphest/controller/ManiphestTaskDetailController.php

reviewed

··· 215 215 ->setIcon('fa-anchor') 216 216 ->setSubmenu($task_submenu)); 217 217 218 218 + $relationship_list = PhabricatorObjectRelationshipList::newForObject( 219 219 + $viewer, 220 220 + $task); 221 221 + 222 222 + $relationship_submenu = $relationship_list->newActionMenu(); 223 223 + if ($relationship_submenu) { 224 224 + $curtain->addAction($relationship_submenu); 225 225 + } 226 226 + 218 227 $owner_phid = $task->getOwnerPHID(); 219 228 $author_phid = $task->getAuthorPHID(); 220 229 $handles = $viewer->loadHandles(array($owner_phid, $author_phid));

+27

src/applications/maniphest/relationship/ManiphestTaskHasCommitRelationship.php

reviewed

··· 1 1 + <?php 2 2 + 3 3 + final class ManiphestTaskHasCommitRelationship 4 4 + extends ManiphestTaskRelationship { 5 5 + 6 6 + const RELATIONSHIPKEY = 'task.has-commit'; 7 7 + 8 8 + public function getEdgeConstant() { 9 9 + return ManiphestTaskHasCommitEdgeType::EDGECONST; 10 10 + } 11 11 + 12 12 + protected function getActionName() { 13 13 + return pht('Edit Commits'); 14 14 + } 15 15 + 16 16 + protected function getActionIcon() { 17 17 + return 'fa-code'; 18 18 + } 19 19 + 20 20 + public function shouldAppearInActionMenu() { 21 21 + // TODO: For now, the default search for commits is not very good, so 22 22 + // it is hard to find objects to link to. Until that works better, just 23 23 + // hide this item. 24 24 + return false; 25 25 + } 26 26 + 27 27 + }

+20

src/applications/maniphest/relationship/ManiphestTaskHasMockRelationship.php

reviewed

··· 1 1 + <?php 2 2 + 3 3 + final class ManiphestTaskHasMockRelationship 4 4 + extends ManiphestTaskRelationship { 5 5 + 6 6 + const RELATIONSHIPKEY = 'task.has-mock'; 7 7 + 8 8 + public function getEdgeConstant() { 9 9 + return ManiphestTaskHasMockEdgeType::EDGECONST; 10 10 + } 11 11 + 12 12 + protected function getActionName() { 13 13 + return pht('Edit Mocks'); 14 14 + } 15 15 + 16 16 + protected function getActionIcon() { 17 17 + return 'fa-camera-retro'; 18 18 + } 19 19 + 20 20 + }

+20

src/applications/maniphest/relationship/ManiphestTaskHasRevisionRelationship.php

reviewed

··· 1 1 + <?php 2 2 + 3 3 + final class ManiphestTaskHasRevisionRelationship 4 4 + extends ManiphestTaskRelationship { 5 5 + 6 6 + const RELATIONSHIPKEY = 'task.has-revision'; 7 7 + 8 8 + public function getEdgeConstant() { 9 9 + return ManiphestTaskHasRevisionEdgeType::EDGECONST; 10 10 + } 11 11 + 12 12 + protected function getActionName() { 13 13 + return pht('Edit Revisions'); 14 14 + } 15 15 + 16 16 + protected function getActionIcon() { 17 17 + return 'fa-cog'; 18 18 + } 19 19 + 20 20 + }

+19

src/applications/maniphest/relationship/ManiphestTaskRelationship.php

reviewed

··· 1 1 + <?php 2 2 + 3 3 + abstract class ManiphestTaskRelationship 4 4 + extends PhabricatorObjectRelationship { 5 5 + 6 6 + public function isEnabledForObject($object) { 7 7 + $viewer = $this->getViewer(); 8 8 + 9 9 + $has_app = PhabricatorApplication::isClassInstalledForViewer( 10 10 + 'PhabricatorManiphestApplication', 11 11 + $viewer); 12 12 + if (!$has_app) { 13 13 + return false; 14 14 + } 15 15 + 16 16 + return ($object instanceof ManiphestTask); 17 17 + } 18 18 + 19 19 + }

-6

src/applications/pholio/application/PhabricatorPholioApplication.php

reviewed

··· 26 26 return pht('Things before they were cool.'); 27 27 } 28 28 29 29 - public function getEventListeners() { 30 30 - return array( 31 31 - new PholioActionMenuEventListener(), 32 32 - ); 33 33 - } 34 34 - 35 29 public function getRemarkupRules() { 36 30 return array( 37 31 new PholioRemarkupRule(),

-50

src/applications/pholio/event/PholioActionMenuEventListener.php

reviewed

··· 1 1 - <?php 2 2 - 3 3 - final class PholioActionMenuEventListener 4 4 - extends PhabricatorEventListener { 5 5 - 6 6 - public function register() { 7 7 - $this->listen(PhabricatorEventType::TYPE_UI_DIDRENDERACTIONS); 8 8 - } 9 9 - 10 10 - public function handleEvent(PhutilEvent $event) { 11 11 - switch ($event->getType()) { 12 12 - case PhabricatorEventType::TYPE_UI_DIDRENDERACTIONS: 13 13 - $this->handleActionsEvent($event); 14 14 - break; 15 15 - } 16 16 - } 17 17 - 18 18 - private function handleActionsEvent(PhutilEvent $event) { 19 19 - $object = $event->getValue('object'); 20 20 - 21 21 - $actions = null; 22 22 - if ($object instanceof ManiphestTask) { 23 23 - $actions = $this->renderTaskItems($event); 24 24 - } 25 25 - 26 26 - $this->addActionMenuItems($event, $actions); 27 27 - } 28 28 - 29 29 - private function renderTaskItems(PhutilEvent $event) { 30 30 - if (!$this->canUseApplication($event->getUser())) { 31 31 - return; 32 32 - } 33 33 - 34 34 - $task = $event->getValue('object'); 35 35 - $phid = $task->getPHID(); 36 36 - 37 37 - $can_edit = PhabricatorPolicyFilter::hasCapability( 38 38 - $event->getUser(), 39 39 - $task, 40 40 - PhabricatorPolicyCapability::CAN_EDIT); 41 41 - 42 42 - return id(new PhabricatorActionView()) 43 43 - ->setName(pht('Edit Pholio Mocks')) 44 44 - ->setHref("/search/attach/{$phid}/MOCK/edge/") 45 45 - ->setIcon('fa-camera-retro') 46 46 - ->setDisabled(!$can_edit) 47 47 - ->setWorkflow(true); 48 48 - } 49 49 - 50 50 - }

+81

src/applications/search/relationship/PhabricatorObjectRelationship.php

reviewed

··· 1 1 + <?php 2 2 + 3 3 + abstract class PhabricatorObjectRelationship extends Phobject { 4 4 + 5 5 + private $viewer; 6 6 + 7 7 + public function setViewer(PhabricatorUser $viewer) { 8 8 + $this->viewer = $viewer; 9 9 + return $this; 10 10 + } 11 11 + 12 12 + public function getViewer() { 13 13 + return $this->viewer; 14 14 + } 15 15 + 16 16 + final public function getRelationshipConstant() { 17 17 + return $this->getPhobjectClassConstant('RELATIONSHIPKEY'); 18 18 + } 19 19 + 20 20 + abstract public function isEnabledForObject($object); 21 21 + 22 22 + abstract public function getEdgeConstant(); 23 23 + 24 24 + abstract protected function getActionName(); 25 25 + abstract protected function getActionIcon(); 26 26 + 27 27 + public function shouldAppearInActionMenu() { 28 28 + return true; 29 29 + } 30 30 + 31 31 + protected function isActionEnabled($object) { 32 32 + $viewer = $this->getViewer(); 33 33 + 34 34 + return PhabricatorPolicyFilter::hasCapability( 35 35 + $viewer, 36 36 + $object, 37 37 + PhabricatorPolicyCapability::CAN_EDIT); 38 38 + } 39 39 + 40 40 + final public function newAction($object) { 41 41 + $is_enabled = $this->isActionEnabled($object); 42 42 + $action_uri = $this->getActionURI($object); 43 43 + 44 44 + return id(new PhabricatorActionView()) 45 45 + ->setName($this->getActionName()) 46 46 + ->setHref($action_uri) 47 47 + ->setIcon($this->getActionIcon()) 48 48 + ->setDisabled(!$is_enabled) 49 49 + ->setWorkflow(true); 50 50 + } 51 51 + 52 52 + final public static function getAllRelationships() { 53 53 + return id(new PhutilClassMapQuery()) 54 54 + ->setAncestorClass(__CLASS__) 55 55 + ->setUniqueMethod('getRelationshipConstant') 56 56 + ->execute(); 57 57 + } 58 58 + 59 59 + private function getActionURI($object) { 60 60 + $phid = $object->getPHID(); 61 61 + 62 62 + // TODO: Remove this, this is just legacy support for the current 63 63 + // controller until a new one gets built. 64 64 + $legacy_kinds = array( 65 65 + ManiphestTaskHasCommitEdgeType::EDGECONST => 'CMIT', 66 66 + ManiphestTaskHasMockEdgeType::EDGECONST => 'MOCK', 67 67 + ManiphestTaskHasRevisionEdgeType::EDGECONST => 'DREV', 68 68 + ); 69 69 + 70 70 + $edge_type = $this->getEdgeConstant(); 71 71 + $legacy_kind = idx($legacy_kinds, $edge_type); 72 72 + if (!$legacy_kind) { 73 73 + throw new Exception( 74 74 + pht( 75 75 + 'Only specific legacy relationships are supported!')); 76 76 + } 77 77 + 78 78 + return "/search/attach/{$phid}/{$legacy_kind}/"; 79 79 + } 80 80 + 81 81 + }

+95

src/applications/search/relationship/PhabricatorObjectRelationshipList.php

reviewed

··· 1 1 + <?php 2 2 + 3 3 + final class PhabricatorObjectRelationshipList extends Phobject { 4 4 + 5 5 + private $viewer; 6 6 + private $object; 7 7 + private $relationships; 8 8 + 9 9 + public function setViewer(PhabricatorUser $viewer) { 10 10 + $this->viewer = $viewer; 11 11 + return $this; 12 12 + } 13 13 + 14 14 + public function getViewer() { 15 15 + if ($this->viewer === null) { 16 16 + throw new PhutilInvalidStateException('setViewer'); 17 17 + } 18 18 + 19 19 + return $this->viewer; 20 20 + } 21 21 + 22 22 + public function setObject($object) { 23 23 + $this->object = $object; 24 24 + return $this; 25 25 + } 26 26 + 27 27 + public function getObject() { 28 28 + if ($this->object === null) { 29 29 + throw new PhutilInvalidStateException('setObject'); 30 30 + } 31 31 + 32 32 + return $this->object; 33 33 + } 34 34 + 35 35 + public function setRelationships(array $relationships) { 36 36 + assert_instances_of($relationships, 'PhabricatorObjectRelationship'); 37 37 + $this->relationships = $relationships; 38 38 + return $this; 39 39 + } 40 40 + 41 41 + public function getRelationships() { 42 42 + if ($this->relationships === null) { 43 43 + throw new PhutilInvalidStateException('setRelationships'); 44 44 + } 45 45 + 46 46 + return $this->relationships; 47 47 + } 48 48 + 49 49 + public function newActionMenu() { 50 50 + $relationships = $this->getRelationships(); 51 51 + $object = $this->getObject(); 52 52 + 53 53 + $actions = array(); 54 54 + foreach ($relationships as $key => $relationship) { 55 55 + if (!$relationship->shouldAppearInActionMenu()) { 56 56 + continue; 57 57 + } 58 58 + 59 59 + $actions[$key] = $relationship->newAction($object); 60 60 + } 61 61 + 62 62 + if (!$actions) { 63 63 + return null; 64 64 + } 65 65 + 66 66 + $actions = msort($actions, 'getName'); 67 67 + 68 68 + return id(new PhabricatorActionView()) 69 69 + ->setName(pht('Edit Related Objects...')) 70 70 + ->setIcon('fa-link') 71 71 + ->setSubmenu($actions); 72 72 + } 73 73 + 74 74 + public static function newForObject(PhabricatorUser $viewer, $object) { 75 75 + $relationships = PhabricatorObjectRelationship::getAllRelationships(); 76 76 + 77 77 + $results = array(); 78 78 + foreach ($relationships as $key => $relationship) { 79 79 + $relationship = clone $relationship; 80 80 + 81 81 + $relationship->setViewer($viewer); 82 82 + if (!$relationship->isEnabledForObject($object)) { 83 83 + continue; 84 84 + } 85 85 + 86 86 + $results[$key] = $relationship; 87 87 + } 88 88 + 89 89 + return id(new self()) 90 90 + ->setViewer($viewer) 91 91 + ->setObject($object) 92 92 + ->setRelationships($results); 93 93 + } 94 94 + 95 95 + }

+4

src/view/layout/PhabricatorActionView.php

reviewed

··· 70 70 return $this; 71 71 } 72 72 73 73 + public function getName() { 74 74 + return $this->name; 75 75 + } 76 76 + 73 77 public function setLabel($label) { 74 78 $this->label = $label; 75 79 return $this;