Skip to content

Firefly III: a personal finances manager

Fix #12947

James Colede1d7e48d15c
diff --git a/app/Http/Controllers/SearchController.php b/app/Http/Controllers/SearchController.php
index 679d332955..d7d5b91b24 100644
--- a/app/Http/Controllers/SearchController.php
+++ b/app/Http/Controllers/SearchController.php
@@ -31,6 +31,7 @@ use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Log;
use Illuminate\View\View;
+use Illuminate\Support\Facades\View as ViewFacade;
use Throwable;
use function Safe\mb_convert_encoding;
@@ -95,6 +96,8 @@ final class SearchController extends Controller
$invalidOperators = $searcher->getInvalidOperators();
$subTitle = (string) trans('breadcrumbs.search_result', ['query' => $fullQuery]);
+ // overrule the FF3_FROM variable.
+
return view('search.index', [
'words' => $words,
'excludedWords' => $excludedWords,
@@ -123,6 +126,7 @@ final class SearchController extends Controller
$fullQuery = (string) $entry;
$page = 0 === (int) $request->input('page') ? 1 : (int) $request->input('page');
$page = clamp(value: $page, min: 1, max: 2 ** 16);
+ $from = $request->input('_from');
$searcher->parseQuery($fullQuery);
@@ -134,6 +138,8 @@ final class SearchController extends Controller
$url = route('search.index').'?'.http_build_query($parameters);
$groups->setPath($url);
+ ViewFacade::share('FF3_FROM', $from);
+
try {
$html = view('search.search', ['groups' => $groups, 'hasPages' => $hasPages, 'searchTime' => $searchTime])->render();
} catch (Throwable $e) {
diff --git a/public/v1/js/ff/search/index.js b/public/v1/js/ff/search/index.js
index a4263e0396..1f84ea3410 100644
--- a/public/v1/js/ff/search/index.js
+++ b/public/v1/js/ff/search/index.js
@@ -27,7 +27,7 @@ $(function () {
});
function startSearch(query) {
- $.post(searchUrl, {query: query, _token: token}).done(presentSearchResults).fail(searchFailure);
+ $.post(searchUrl, {query: query, _token: token, _from: from}).done(presentSearchResults).fail(searchFailure);
}
function searchFailure() {