kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-01-31 01:39:26 +00:00
Code Issues Projects Releases Wiki Activity

🤖 Auto commit for release 'develop' on 2026-01-23

Browse Source
This commit is contained in:
JC5
2026-01-23 15:14:29 +01:00
parent 8f15a32bd6
commit eeeba86d38
888 changed files with 10732 additions and 10387 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -61,18 +61,18 @@ class SearchController extends Controller
public function index(Request $request, SearchInterface $searcher): Factory|\Illuminate\Contracts\View\View
{
// search params:
$fullQuery = $request->get('search');
$fullQuery = $request->get('search');
if (is_array($request->get('search'))) {
$fullQuery = '';
}
$fullQuery = (string) $fullQuery;
$page = 0 === (int) $request->get('page') ? 1 : (int) $request->get('page');
$ruleId = (int) $request->get('rule');
$ruleChanged = false;
$fullQuery = (string) $fullQuery;
$page = 0 === (int) $request->get('page') ? 1 : (int) $request->get('page');
$ruleId = (int) $request->get('rule');
$ruleChanged = false;
// find rule, check if query is different, offer to update.
$ruleRepository = app(RuleRepositoryInterface::class);
$rule = $ruleRepository->find($ruleId);
$ruleRepository = app(RuleRepositoryInterface::class);
$rule = $ruleRepository->find($ruleId);
if (null !== $rule) {
$originalQuery = $ruleRepository->getSearchQuery($rule);
if ($originalQuery !== $fullQuery) {
@@ -99,7 +99,7 @@ class SearchController extends Controller
'subTitle' => $subTitle,
'ruleId' => $ruleId,
'ruleChanged' => $ruleChanged,
'invalidOperators' => $invalidOperators
'invalidOperators' => $invalidOperators,
]);
}
@@ -110,12 +110,12 @@ class SearchController extends Controller
*/
public function search(Request $request, SearchInterface $searcher): JsonResponse
{
$entry = $request->get('query');
$entry = $request->get('query');
if (!is_scalar($entry)) {
$entry = '';
}
$fullQuery = (string) $entry;
$page = 0 === (int) $request->get('page') ? 1 : (int) $request->get('page');
$fullQuery = (string) $entry;
$page = 0 === (int) $request->get('page') ? 1 : (int) $request->get('page');
$searcher->parseQuery($fullQuery);
@@ -124,7 +124,7 @@ class SearchController extends Controller
$hasPages = $groups->hasPages();
$searchTime = round($searcher->searchTime(), 3); // in seconds
$parameters = ['search' => $fullQuery];
$url = route('search.index') . '?' . http_build_query($parameters);
$url = route('search.index').'?'.http_build_query($parameters);
$groups->setPath($url);
try {