kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-12 15:35:15 +00:00
Code Issues Projects Releases Wiki Activity

Fix #2564

Browse Source
This commit is contained in:
James Cole
2019-09-08 20:21:44 +02:00
parent 2de79ea392
commit 5ae91845c1
6 changed files with 36 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
app/Http/Controllers/SearchController.php
View File

@@ -61,14 +61,14 @@ class SearchController extends Controller
public function index(Request $request, SearchInterface $searcher)
{
$fullQuery = (string)$request->get('search');
$page = 0 === (int)$request->get('page') ? 1 : (int)$request->get('page');
// parse search terms:
$searcher->parseQuery($fullQuery);
$query = $searcher->getWordsAsString();
$modifiers = $searcher->getModifiers();
$subTitle = (string)trans('breadcrumbs.search_result', ['query' => $query]);
return view('search.index', compact('query', 'modifiers', 'fullQuery', 'subTitle'));
return view('search.index', compact('query', 'modifiers', 'page','fullQuery', 'subTitle'));
}
/**
@@ -81,15 +81,20 @@ class SearchController extends Controller
*/
public function search(Request $request, SearchInterface $searcher): JsonResponse
{
$fullQuery = (string)$request->get('query');
$fullQuery = (string)$request->get('query');
$page = 0 === (int)$request->get('page') ? 1 : (int)$request->get('page');
$searcher->parseQuery($fullQuery);
$searcher->setPage($page);
$searcher->setLimit((int)config('firefly.search_result_limit'));
$groups = $searcher->searchTransactions();
$groups = $searcher->searchTransactions();
$hasPages = $groups->hasPages();
$searchTime = round($searcher->searchTime(), 3); // in seconds
$parameters = ['search' => $fullQuery];
$url = route('search.index') . '?' . http_build_query($parameters);
$groups->setPath($url);
try {
$html = view('search.search', compact('groups','searchTime'))->render();
$html = view('search.search', compact('groups', 'hasPages', 'searchTime'))->render();
// @codeCoverageIgnoreStart
} catch (Throwable $e) {
Log::error(sprintf('Cannot render search.search: %s', $e->getMessage()));