archive/phabricator
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Inline comment-related fixes.

Browse Source
This commit is contained in:
epriestley
2011-02-02 19:38:43 -08:00
parent 223ac18287
commit 4aa72aa5ff
27 changed files with 368 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/applications/differential/controller/revisionview/DifferentialRevisionViewController.php
View File

@@ -46,6 +46,8 @@ class DifferentialRevisionViewController extends DifferentialController {
$this->getImplicitComments($revision),
$comments);
$inlines = $this->loadInlineComments($comments, $changesets);
$object_phids = array_merge(
$revision->getReviewers(),
$revision->getCCPHIDs(),
@@ -54,6 +56,7 @@ class DifferentialRevisionViewController extends DifferentialController {
$request->getUser()->getPHID(),
),
mpull($comments, 'getAuthorPHID'));
$object_phids = array_unique($object_phids);
$handles = id(new PhabricatorObjectHandleData($object_phids))
->loadHandles();
@@ -70,6 +73,8 @@ class DifferentialRevisionViewController extends DifferentialController {
$comment_view = new DifferentialRevisionCommentListView();
$comment_view->setComments($comments);
$comment_view->setHandles($handles);
$comment_view->setInlineComments($inlines);
$comment_view->setChangesets($changesets);
$diff_history = new DifferentialRevisionUpdateHistoryView();
$diff_history->setDiffs($diffs);
@@ -267,6 +272,46 @@ class DifferentialRevisionViewController extends DifferentialController {
return array_keys($actions);
}
private function loadInlineComments(array $comments, array &$changesets) {
$inline_comments = array();
$comment_ids = array_filter(mpull($comments, 'getID'));
if (!$comment_ids) {
return $inline_comments;
}
$inline_comments = id(new DifferentialInlineComment())
->loadAllWhere(
'commentID in (%Ld)',
$comment_ids);
$load_changesets = array();
foreach ($inline_comments as $inline) {
$changeset_id = $inline->getChangesetID();
if (isset($changesets[$changeset_id])) {
continue;
}
$load_changesets[$changeset_id] = true;
}
$more_changesets = array();
if ($load_changesets) {
$changeset_ids = array_keys($load_changesets);
$more_changesets += id(new DifferentialChangeset())
->loadAllWhere(
'id IN (%Ld)',
$changeset_ids);
}
if ($more_changesets) {
$changesets += $more_changesets;
$changesets = msort($changesets, 'getSortKey');
}
return $inline_comments;
}
}
/*

2
src/applications/differential/controller/revisionview/__init__.php
View File

@@ -10,7 +10,9 @@ phutil_require_module('phabricator', 'aphront/response/404');
phutil_require_module('phabricator', 'applications/differential/constants/action');
phutil_require_module('phabricator', 'applications/differential/constants/revisionstatus');
phutil_require_module('phabricator', 'applications/differential/controller/base');
phutil_require_module('phabricator', 'applications/differential/storage/changeset');
phutil_require_module('phabricator', 'applications/differential/storage/comment');
phutil_require_module('phabricator', 'applications/differential/storage/inlinecomment');
phutil_require_module('phabricator', 'applications/differential/storage/revision');
phutil_require_module('phabricator', 'applications/differential/view/addcomment');
phutil_require_module('phabricator', 'applications/differential/view/changesetlistview');