View Options

	diff --git a/src/applications/search/controller/PhabricatorSearchController.php b/src/applications/search/controller/PhabricatorSearchController.php
	index b3d3ab18fa..336604d228 100644
	--- a/src/applications/search/controller/PhabricatorSearchController.php
	+++ b/src/applications/search/controller/PhabricatorSearchController.php
	@@ -1,114 +1,114 @@
	<?php

	final class PhabricatorSearchController
	extends PhabricatorSearchBaseController {

	const SCOPE_CURRENT_APPLICATION = 'application';

	public function shouldAllowPublic() {
	return true;
	}

	public function handleRequest(AphrontRequest $request) {
	$viewer = $this->getViewer();
	$query = $request->getStr('query');

	- if ($request->getStr('jump') != 'no' && strlen($query)) {
	+ if ($request->getStr('jump') != 'no' && phutil_nonempty_string($query)) {
	$jump_uri = id(new PhabricatorDatasourceEngine())
	->setViewer($viewer)
	->newJumpURI($query);

	if ($jump_uri !== null) {
	return id(new AphrontRedirectResponse())->setURI($jump_uri);
	}
	}

	$engine = new PhabricatorSearchApplicationSearchEngine();
	$engine->setViewer($viewer);

	// If we're coming from primary search, do some special handling to
	// interpret the scope selector and query.
	if ($request->getBool('search:primary')) {

	// If there's no query, just take the user to advanced search.
	if (!strlen($query)) {
	$advanced_uri = '/search/query/advanced/';
	return id(new AphrontRedirectResponse())->setURI($advanced_uri);
	}

	// First, load or construct a template for the search by examining
	// the current search scope.
	$scope = $request->getStr('search:scope');
	$saved = null;

	if ($scope == self::SCOPE_CURRENT_APPLICATION) {
	$application = id(new PhabricatorApplicationQuery())
	->setViewer($viewer)
	->withClasses(array($request->getStr('search:application')))
	->executeOne();
	if ($application) {
	$types = $application->getApplicationSearchDocumentTypes();
	if ($types) {
	$saved = id(new PhabricatorSavedQuery())
	->setEngineClassName(get_class($engine))
	->setParameter('types', $types)
	->setParameter('statuses', array('open'));
	}
	}
	}

	if (!$saved && !$engine->isBuiltinQuery($scope)) {
	$saved = id(new PhabricatorSavedQueryQuery())
	->setViewer($viewer)
	->withQueryKeys(array($scope))
	->executeOne();
	}

	if (!$saved) {
	if (!$engine->isBuiltinQuery($scope)) {
	$scope = 'all';
	}
	$saved = $engine->buildSavedQueryFromBuiltin($scope);
	}

	// Add the user's query, then save this as a new saved query and send
	// the user to the results page.
	$saved->setParameter('query', $query);

	$unguarded = AphrontWriteGuard::beginScopedUnguardedWrites();
	try {
	$saved->setID(null)->save();
	} catch (AphrontDuplicateKeyQueryException $ex) {
	// Ignore, this is just a repeated search.
	}
	unset($unguarded);

	$query_key = $saved->getQueryKey();
	$results_uri = $engine->getQueryResultsPageURI($query_key).'#R';
	return id(new AphrontRedirectResponse())->setURI($results_uri);
	}

	$controller = id(new PhabricatorApplicationSearchController())
	->setQueryKey($request->getURIData('queryKey'))
	->setSearchEngine($engine)
	->setNavigation($this->buildSideNavView());

	return $this->delegateToController($controller);
	}

	public function buildSideNavView($for_app = false) {
	$viewer = $this->getViewer();

	$nav = new AphrontSideNavFilterView();
	$nav->setBaseURI(new PhutilURI($this->getApplicationURI()));

	id(new PhabricatorSearchApplicationSearchEngine())
	->setViewer($viewer)
	->addNavigationItems($nav->getMenu());

	$nav->selectFilter(null);

	return $nav;
	}

	}

File Metadata

Mime Type: text/x-diff
Expires: Sat, Nov 23, 1:59 PM (1 d, 3 h)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 971
Default Alt Text: (4 KB)

No OneTemporary
Actions

View Options

File Metadata

Event Timeline

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions