diff --git a/src/infrastructure/graph/ManiphestTaskGraph.php b/src/infrastructure/graph/ManiphestTaskGraph.php index 53727b3779..2fe62af599 100644 --- a/src/infrastructure/graph/ManiphestTaskGraph.php +++ b/src/infrastructure/graph/ManiphestTaskGraph.php @@ -1,163 +1,161 @@ isClosed(); } protected function newTableRow($phid, $object, $trace) { $viewer = $this->getViewer(); if ($object) { $status = $object->getStatus(); $priority = $object->getPriority(); $status_icon = ManiphestTaskStatus::getStatusIcon($status); $status_name = ManiphestTaskStatus::getTaskStatusName($status); $priority_color = ManiphestTaskPriority::getTaskPriorityColor($priority); if ($object->isClosed()) { $priority_color = 'grey'; } $status = array( id(new PHUIIconView())->setIcon($status_icon, $priority_color), ' ', $status_name, ); $owner_phid = $object->getOwnerPHID(); if ($owner_phid) { $assigned = $viewer->renderHandle($owner_phid); } else { $assigned = phutil_tag('em', array(), pht('None')); } $link = phutil_tag( 'a', array( 'href' => $object->getURI(), ), $object->getTitle()); $link = array( phutil_tag( 'span', array( 'class' => 'object-name', ), $object->getMonogram()), ' ', $link, ); } else { $status = null; $assigned = null; $link = $viewer->renderHandle($phid); } - - - if ($this->isParentTask($object)) { + if ($this->isParentTask($phid)) { $marker = 'fa-chevron-circle-up bluegrey'; $marker_tip = pht('Direct Parent'); - } else if ($this->isChildTask($object)) { + } else if ($this->isChildTask($phid)) { $marker = 'fa-chevron-circle-down bluegrey'; $marker_tip = pht('Direct Subtask'); } else { $marker = null; } if ($marker) { $marker = id(new PHUIIconView()) ->setIcon($marker) ->addSigil('has-tooltip') ->setMetadata( array( 'tip' => $marker_tip, 'align' => 'E', )); } $link = AphrontTableView::renderSingleDisplayLine($link); return array( $marker, $trace, $status, $assigned, $link, ); } protected function newTable(AphrontTableView $table) { return $table ->setHeaders( array( null, null, pht('Status'), pht('Assigned'), pht('Task'), )) ->setColumnClasses( array( 'nudgeright', 'threads', 'graph-status', null, 'wide pri object-link', )); } - private function isParentTask(ManiphestTask $task) { + private function isParentTask($task_phid) { $map = $this->getSeedMap(ManiphestTaskDependedOnByTaskEdgeType::EDGECONST); - return isset($map[$task->getPHID()]); + return isset($map[$task_phid]); } - private function isChildTask(ManiphestTask $task) { + private function isChildTask($task_phid) { $map = $this->getSeedMap(ManiphestTaskDependsOnTaskEdgeType::EDGECONST); - return isset($map[$task->getPHID()]); + return isset($map[$task_phid]); } private function getSeedMap($type) { if (!isset($this->seedMaps[$type])) { $maps = $this->getEdges($type); $phids = idx($maps, $this->getSeedPHID(), array()); $phids = array_fuse($phids); $this->seedMaps[$type] = $phids; } return $this->seedMaps[$type]; } protected function newEllipsisRow() { return array( null, null, null, null, pht("\xC2\xB7 \xC2\xB7 \xC2\xB7"), ); } }