No OneTemporary
Actions

Size

6 KB

Referenced Files

None

Subscribers

None

View Options

	diff --git a/src/applications/audit/query/PhabricatorCommitSearchEngine.php b/src/applications/audit/query/PhabricatorCommitSearchEngine.php
	index a24a11a7f1..837e665824 100644
	--- a/src/applications/audit/query/PhabricatorCommitSearchEngine.php
	+++ b/src/applications/audit/query/PhabricatorCommitSearchEngine.php
	@@ -1,193 +1,200 @@
	<?php

	final class PhabricatorCommitSearchEngine
	extends PhabricatorApplicationSearchEngine {

	public function buildSavedQueryFromRequest(AphrontRequest $request) {
	$saved = new PhabricatorSavedQuery();

	$saved->setParameter(
	'auditorPHIDs',
	$this->readPHIDsFromRequest($request, 'auditorPHIDs'));

	$saved->setParameter(
	'commitAuthorPHIDs',
	$this->readUsersFromRequest($request, 'authors'));

	$saved->setParameter(
	'auditStatus',
	$request->getStr('auditStatus'));

	$saved->setParameter(
	'repositoryPHIDs',
	$this->readPHIDsFromRequest($request, 'repositoryPHIDs'));

	// -- TODO - T4173 - file location

	return $saved;
	}

	public function buildQueryFromSavedQuery(PhabricatorSavedQuery $saved) {
	$query = id(new DiffusionCommitQuery())
	->needAuditRequests(true)
	->needCommitData(true);

	$auditor_phids = $saved->getParameter('auditorPHIDs', array());
	if ($auditor_phids) {
	$query->withAuditorPHIDs($auditor_phids);
	}

	$commit_author_phids = $saved->getParameter('commitAuthorPHIDs', array());
	if ($commit_author_phids) {
	$query->withAuthorPHIDs($commit_author_phids);
	}

	$audit_status = $saved->getParameter('auditStatus', null);
	if ($audit_status) {
	$query->withAuditStatus($audit_status);
	}

	$awaiting_user_phid = $saved->getParameter('awaitingUserPHID', null);
	if ($awaiting_user_phid) {
	// This is used only for the built-in "needs attention" filter,
	// so cheat and just use the already-loaded viewer rather than reloading
	// it.
	$query->withAuditAwaitingUser($this->requireViewer());
	}

	return $query;
	}

	public function buildSearchForm(
	AphrontFormView $form,
	PhabricatorSavedQuery $saved) {

	$auditor_phids = $saved->getParameter('auditorPHIDs', array());
	$commit_author_phids = $saved->getParameter(
	'commitAuthorPHIDs',
	array());
	$audit_status = $saved->getParameter('auditStatus', null);

	$phids = array_mergev(
	array(
	$auditor_phids,
	$commit_author_phids));

	$handles = id(new PhabricatorHandleQuery())
	->setViewer($this->requireViewer())
	->withPHIDs($phids)
	->execute();

	$form
	->appendChild(
	id(new AphrontFormTokenizerControl())
	->setDatasource('/typeahead/common/usersprojectsorpackages/')
	->setName('auditorPHIDs')
	->setLabel(pht('Auditors'))
	->setValue(array_select_keys($handles, $auditor_phids)))
	->appendChild(
	id(new AphrontFormTokenizerControl())
	->setDatasource('/typeahead/common/users/')
	->setName('authors')
	->setLabel(pht('Commit Authors'))
	->setValue(array_select_keys($handles, $commit_author_phids)))
	->appendChild(
	id(new AphrontFormSelectControl())
	->setName('auditStatus')
	->setLabel(pht('Audit Status'))
	->setOptions($this->getAuditStatusOptions())
	->setValue($audit_status));
	}

	protected function getURI($path) {
	return '/audit/'.$path;
	}

	public function getBuiltinQueryNames() {
	$names = array();

	if ($this->requireViewer()->isLoggedIn()) {
	$names['need'] = pht('Need Attention');
	$names['problem'] = pht('Problem Commits');
	}

	$names['open'] = pht('Open Audits');

	+ if ($this->requireViewer()->isLoggedIn()) {
	+ $names['authored'] = pht('Authored Commits');
	+ }
	+
	$names['all'] = pht('All Commits');

	return $names;
	}

	public function buildSavedQueryFromBuiltin($query_key) {
	$query = $this->newSavedQuery();
	$query->setQueryKey($query_key);
	$viewer = $this->requireViewer();

	switch ($query_key) {
	case 'all':
	return $query;
	case 'open':
	$query->setParameter(
	'auditStatus',
	DiffusionCommitQuery::AUDIT_STATUS_OPEN);
	return $query;
	case 'need':
	$query->setParameter('awaitingUserPHID', $viewer->getPHID());
	$query->setParameter(
	'auditStatus',
	DiffusionCommitQuery::AUDIT_STATUS_OPEN);
	$query->setParameter(
	'auditorPHIDs',
	PhabricatorAuditCommentEditor::loadAuditPHIDsForUser($viewer));
	return $query;
	+ case 'authored':
	+ $query->setParameter('commitAuthorPHIDs', array($viewer->getPHID()));
	+ return $query;
	case 'problem':
	$query->setParameter('commitAuthorPHIDs', array($viewer->getPHID()));
	$query->setParameter(
	'auditStatus',
	DiffusionCommitQuery::AUDIT_STATUS_CONCERN);
	return $query;
	}

	return parent::buildSavedQueryFromBuiltin($query_key);
	}

	private function getAuditStatusOptions() {
	return array(
	DiffusionCommitQuery::AUDIT_STATUS_ANY => pht('Any'),
	DiffusionCommitQuery::AUDIT_STATUS_OPEN => pht('Open'),
	DiffusionCommitQuery::AUDIT_STATUS_CONCERN => pht('Concern Raised'),
	);
	}

	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();
	}

	}

File Metadata

Mime Type: text/x-diff
Expires: Sun, Jan 19, 20:08 (1 w, 5 d ago)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 1128312
Default Alt Text: (6 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions