Page MenuHomePhabricator

D9011.id21425.diff
No OneTemporary

D9011.id21425.diff

diff --git a/src/applications/audit/controller/PhabricatorAuditListController.php b/src/applications/audit/controller/PhabricatorAuditListController.php
--- a/src/applications/audit/controller/PhabricatorAuditListController.php
+++ b/src/applications/audit/controller/PhabricatorAuditListController.php
@@ -1,8 +1,7 @@
<?php
final class PhabricatorAuditListController
- extends PhabricatorAuditController
- implements PhabricatorApplicationSearchResultsControllerInterface {
+ extends PhabricatorAuditController {
private $queryKey;
private $name;
@@ -26,23 +25,4 @@
return $this->delegateToController($controller);
}
- public function renderResultsList(
- array $commits,
- PhabricatorSavedQuery $query) {
- assert_instances_of($commits, 'PhabricatorRepositoryCommit');
-
- $viewer = $this->getRequest()->getUser();
- $nodata = pht('No matching audits.');
- $view = id(new PhabricatorAuditListView())
- ->setUser($viewer)
- ->setCommits($commits)
- ->setAuthorityPHIDs(
- PhabricatorAuditCommentEditor::loadAuditPHIDsForUser($viewer))
- ->setNoDataString($nodata);
-
- $phids = $view->getRequiredHandlePHIDs();
- $handles = $this->loadViewerHandles($phids);
- $view->setHandles($handles);
- return $view->buildList();
- }
}
diff --git a/src/applications/audit/query/PhabricatorCommitSearchEngine.php b/src/applications/audit/query/PhabricatorCommitSearchEngine.php
--- a/src/applications/audit/query/PhabricatorCommitSearchEngine.php
+++ b/src/applications/audit/query/PhabricatorCommitSearchEngine.php
@@ -159,4 +159,35 @@
);
}
+ protected function renderResultList(
+ array $commits,
+ PhabricatorSavedQuery $query,
+ array $handles) {
+
+ assert_instances_of($commits, 'PhabricatorRepositoryCommit');
+
+ $viewer = $this->requireViewer();
+ $nodata = pht('No matching audits.');
+ $view = id(new PhabricatorAuditListView())
+ ->setUser($viewer)
+ ->setCommits($commits)
+ ->setAuthorityPHIDs(
+ PhabricatorAuditCommentEditor::loadAuditPHIDsForUser($viewer))
+ ->setNoDataString($nodata);
+
+ $phids = $view->getRequiredHandlePHIDs();
+ if ($phids) {
+ $handles = id(new PhabricatorHandleQuery())
+ ->setViewer($viewer)
+ ->withPHIDs($phids)
+ ->execute();
+ } else {
+ $handles = array();
+ }
+
+ $view->setHandles($handles);
+
+ return $view->buildList();
+ }
+
}
diff --git a/src/applications/feed/query/PhabricatorFeedSearchEngine.php b/src/applications/feed/query/PhabricatorFeedSearchEngine.php
--- a/src/applications/feed/query/PhabricatorFeedSearchEngine.php
+++ b/src/applications/feed/query/PhabricatorFeedSearchEngine.php
@@ -124,7 +124,7 @@
return parent::buildSavedQueryFromBuiltin($query_key);
}
- public function renderResultList(
+ protected function renderResultList(
array $objects,
PhabricatorSavedQuery $query,
array $handles) {
diff --git a/src/applications/search/engine/PhabricatorApplicationSearchEngine.php b/src/applications/search/engine/PhabricatorApplicationSearchEngine.php
--- a/src/applications/search/engine/PhabricatorApplicationSearchEngine.php
+++ b/src/applications/search/engine/PhabricatorApplicationSearchEngine.php
@@ -576,13 +576,13 @@
return $this->renderResultList($objects, $query, $handles);
}
- public function getRequiredHandlePHIDsForResultList(
+ protected function getRequiredHandlePHIDsForResultList(
array $objects,
PhabricatorSavedQuery $query) {
return array();
}
- public function renderResultList(
+ protected function renderResultList(
array $objects,
PhabricatorSavedQuery $query,
array $handles) {
diff --git a/src/applications/slowvote/query/PhabricatorSlowvoteSearchEngine.php b/src/applications/slowvote/query/PhabricatorSlowvoteSearchEngine.php
--- a/src/applications/slowvote/query/PhabricatorSlowvoteSearchEngine.php
+++ b/src/applications/slowvote/query/PhabricatorSlowvoteSearchEngine.php
@@ -121,7 +121,7 @@
return mpull($polls, 'getAuthorPHID');
}
- public function renderResultList(
+ protected function renderResultList(
array $polls,
PhabricatorSavedQuery $query,
array $handles) {

File Metadata

Mime Type
text/plain
Expires
Sun, Mar 16, 8:49 PM (1 w, 2 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7706516
Default Alt Text
D9011.id21425.diff (4 KB)

Event Timeline