diff --git a/src/applications/transactions/controller/PhabricatorApplicationTransactionCommentHistoryController.php b/src/applications/transactions/controller/PhabricatorApplicationTransactionCommentHistoryController.php --- a/src/applications/transactions/controller/PhabricatorApplicationTransactionCommentHistoryController.php +++ b/src/applications/transactions/controller/PhabricatorApplicationTransactionCommentHistoryController.php @@ -68,7 +68,8 @@ ->setUser($user) ->setObjectPHID($obj_phid) ->setTransactions($xactions) - ->setShowEditActions(false); + ->setShowEditActions(false) + ->setHideCommentOptions(true); $dialog = id(new AphrontDialogView()) ->setUser($user) diff --git a/src/applications/transactions/view/PhabricatorApplicationTransactionView.php b/src/applications/transactions/view/PhabricatorApplicationTransactionView.php --- a/src/applications/transactions/view/PhabricatorApplicationTransactionView.php +++ b/src/applications/transactions/view/PhabricatorApplicationTransactionView.php @@ -16,6 +16,7 @@ private $pager; private $renderAsFeed; private $renderData = array(); + private $hideCommentOptions = false; public function setRenderAsFeed($feed) { $this->renderAsFeed = $feed; @@ -107,6 +108,15 @@ return $this->renderData; } + public function setHideCommentOptions($hide_comment_options) { + $this->hideCommentOptions = $hide_comment_options; + return $this; + } + + public function getHideCommentOptions() { + return $this->hideCommentOptions; + } + public function buildEvents($with_hiding = false) { $user = $this->getUser(); @@ -388,7 +398,8 @@ ->setTransactionPHID($xaction->getPHID()) ->setUserHandle($xaction->getHandle($xaction->getAuthorPHID())) ->setIcon($xaction->getIcon()) - ->setColor($xaction->getColor()); + ->setColor($xaction->getColor()) + ->setHideCommentOptions($this->getHideCommentOptions()); list($token, $token_removed) = $xaction->getToken(); if ($token) { diff --git a/src/view/phui/PHUITimelineEventView.php b/src/view/phui/PHUITimelineEventView.php --- a/src/view/phui/PHUITimelineEventView.php +++ b/src/view/phui/PHUITimelineEventView.php @@ -25,6 +25,7 @@ private $isNormalComment; private $quoteRef; private $reallyMajorEvent; + private $hideCommentOptions = false; public function setQuoteRef($quote_ref) { $this->quoteRef = $quote_ref; @@ -164,6 +165,15 @@ return $this; } + public function setHideCommentOptions($hide_comment_options) { + $this->hideCommentOptions = $hide_comment_options; + return $this; + } + + public function getHideCommentOptions() { + return $this->hideCommentOptions; + } + public function setToken($token, $removed = false) { $this->token = $token; $this->tokenRemoved = $removed; @@ -259,7 +269,7 @@ $menu = null; $items = array(); $has_menu = false; - if (!$this->getIsPreview()) { + if (!$this->getIsPreview() && !$this->getHideCommentOptions()) { foreach ($this->getEventGroup() as $event) { $items[] = $event->getMenuItems($this->anchor); if ($event->hasChildren()) {