Page MenuHomePhabricator

D14416.diff
No OneTemporary

D14416.diff

diff --git a/src/applications/badges/controller/PhabricatorBadgesViewController.php b/src/applications/badges/controller/PhabricatorBadgesViewController.php
--- a/src/applications/badges/controller/PhabricatorBadgesViewController.php
+++ b/src/applications/badges/controller/PhabricatorBadgesViewController.php
@@ -64,6 +64,9 @@
$add_comment = $this->buildCommentForm($badge);
+ $timeline->setQuoteTargetID($add_comment->getCommentID());
+ $timeline->setQuoteRef('???');
+
return $this->buildApplicationPage(
array(
$crumbs,
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
@@ -90,6 +90,9 @@
->setAction($comment_uri)
->setSubmitButtonName(pht('Add Comment'));
+ $timeline->setQuoteTargetID($add_comment_form->getCommentID());
+ $timeline->setQuoteRef($event->getMonogram());
+
return $this->buildApplicationPage(
array(
$crumbs,
diff --git a/src/applications/countdown/controller/PhabricatorCountdownViewController.php b/src/applications/countdown/controller/PhabricatorCountdownViewController.php
--- a/src/applications/countdown/controller/PhabricatorCountdownViewController.php
+++ b/src/applications/countdown/controller/PhabricatorCountdownViewController.php
@@ -61,6 +61,9 @@
$add_comment = $this->buildCommentForm($countdown);
+ $timeline->setQuoteTargetID($add_comment->getCommentID());
+ $timeline->setQuoteRef($countdown->getMonogram());
+
$content = array(
$crumbs,
$object_box,
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
@@ -149,7 +149,8 @@
$content[] = $object_box;
}
- $content[] = $this->buildComments($commit);
+ $timeline = $this->buildComments($commit);
+ $content[] = $timeline;
$hard_limit = 1000;
@@ -342,7 +343,11 @@
$content[] = $change_list->render();
}
- $content[] = $this->renderAddCommentPanel($commit, $audit_requests);
+ $add_comment = $this->renderAddCommentPanel($commit, $audit_requests);
+ $content[] = $add_comment;
+
+ $timeline->setQuoteTargetID('audit-content');
+ $timeline->setQuoteRef($commit->getMonogram());
$commit_id = 'r'.$callsign.$commit->getCommitIdentifier();
$short_name = DiffusionView::nameCommit(
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
@@ -102,6 +102,9 @@
->setAction($this->getApplicationURI('/comment/'.$file->getID().'/'))
->setSubmitButtonName(pht('Add Comment'));
+ $timeline->setQuoteTargetID($add_comment_form->getCommentID());
+ $timeline->setQuoteRef($file->getMonogram());
+
return array(
$timeline,
$add_comment_form,
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
@@ -52,6 +52,9 @@
$add_comment = $this->buildAddCommentView($document, $comment_form_id);
+ $timeline->setQuoteTargetID($add_comment->getCommentID());
+ $timeline->setQuoteRef($document->getMonogram());
+
$crumbs = $this->buildApplicationCrumbs($this->buildSideNav());
$crumbs->addTextCrumb(
$document->getMonogram(),
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
@@ -75,6 +75,9 @@
->setAction($this->getApplicationURI('/comment/'.$macro->getID().'/'))
->setSubmitButtonName(pht('Add Comment'));
+ $timeline->setQuoteTargetID($add_comment_form->getCommentID());
+ $timeline->setQuoteRef('???');
+
$object_box = id(new PHUIObjectBoxView())
->setHeader($header)
->addPropertyList($properties);
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
@@ -67,7 +67,7 @@
$source_code);
$crumbs = $this->buildApplicationCrumbs()
- ->addTextCrumb('P'.$paste->getID(), '/P'.$paste->getID());
+ ->addTextCrumb('P'.$paste->getID(), '/'.$paste->getMonogram());
$timeline = $this->buildTransactionTimeline(
$paste,
@@ -89,6 +89,9 @@
->setAction($this->getApplicationURI('/comment/'.$paste->getID().'/'))
->setSubmitButtonName(pht('Add Comment'));
+ $timeline->setQuoteTargetID($add_comment_form->getCommentID());
+ $timeline->setQuoteRef($paste->getMonogram());
+
return $this->newPage()
->setTitle($paste->getFullName())
->setCrumbs($crumbs)
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
@@ -87,6 +87,9 @@
$add_comment = $this->buildAddCommentView($mock, $comment_form_id);
+ $timeline->setQuoteTargetID($add_comment->getCommentID());
+ $timeline->setQuoteRef($mock->getMonogram());
+
$crumbs = $this->buildApplicationCrumbs();
$crumbs->addTextCrumb('M'.$mock->getID(), '/M'.$mock->getID());
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
@@ -61,6 +61,9 @@
->setAction($this->getApplicationURI("/question/comment/{$id}/"))
->setSubmitButtonName(pht('Comment'));
+ $timeline->setQuoteTargetID($add_comment->getCommentID());
+ $timeline->setQuoteRef($question->getMonogram());
+
$comment_view = phutil_tag(
'div',
array(
diff --git a/src/applications/ponder/storage/PonderQuestion.php b/src/applications/ponder/storage/PonderQuestion.php
--- a/src/applications/ponder/storage/PonderQuestion.php
+++ b/src/applications/ponder/storage/PonderQuestion.php
@@ -85,6 +85,10 @@
return PhabricatorPHID::generateNewPHID(PonderQuestionPHIDType::TYPECONST);
}
+ public function getMonogram() {
+ return 'Q'.$this->getID();
+ }
+
public function setContentSource(PhabricatorContentSource $content_source) {
$this->contentSource = $content_source->serialize();
return $this;
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
@@ -139,6 +139,9 @@
->setAction("/ponder/answer/comment/{$id}/")
->setSubmitButtonName(pht('Comment'));
+ $this->timeline->setQuoteTargetID($comment_view->getCommentID());
+ $this->timeline->setQuoteRef('???');
+
$hidden_view = phutil_tag(
'div',
array(
diff --git a/src/applications/repository/storage/PhabricatorRepositoryCommit.php b/src/applications/repository/storage/PhabricatorRepositoryCommit.php
--- a/src/applications/repository/storage/PhabricatorRepositoryCommit.php
+++ b/src/applications/repository/storage/PhabricatorRepositoryCommit.php
@@ -202,10 +202,14 @@
}
public function getURI() {
+ return '/'.$this->getMonogram();
+ }
+
+ public function getMonogram() {
$repository = $this->getRepository();
$callsign = $repository->getCallsign();
$commit_identifier = $this->getCommitIdentifier();
- return '/r'.$callsign.$commit_identifier;
+ return 'r'.$callsign.$commit_identifier;
}
/**
diff --git a/src/applications/slowvote/controller/PhabricatorSlowvotePollController.php b/src/applications/slowvote/controller/PhabricatorSlowvotePollController.php
--- a/src/applications/slowvote/controller/PhabricatorSlowvotePollController.php
+++ b/src/applications/slowvote/controller/PhabricatorSlowvotePollController.php
@@ -57,6 +57,9 @@
new PhabricatorSlowvoteTransactionQuery());
$add_comment = $this->buildCommentForm($poll);
+ $timeline->setQuoteTargetID($add_comment->getCommentID());
+ $timeline->setQuoteRef($poll->getMonogram());
+
$object_box = id(new PHUIObjectBoxView())
->setHeader($header)
->addPropertyList($properties);
diff --git a/src/applications/transactions/view/PhabricatorApplicationTransactionCommentView.php b/src/applications/transactions/view/PhabricatorApplicationTransactionCommentView.php
--- a/src/applications/transactions/view/PhabricatorApplicationTransactionCommentView.php
+++ b/src/applications/transactions/view/PhabricatorApplicationTransactionCommentView.php
@@ -225,7 +225,7 @@
return $this->statusID;
}
- private function getCommentID() {
+ public function getCommentID() {
if (!$this->commentID) {
$this->commentID = celerity_generate_unique_node_id();
}

File Metadata

Mime Type
text/plain
Expires
Fri, Jun 7, 7:32 AM (3 w, 1 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
6288622
Default Alt Text
D14416.diff (9 KB)

Event Timeline