diff --git a/app/Http/Controllers/SearchController.php b/app/Http/Controllers/SearchController.php index 55ce4a8148..ce52d7ad05 100644 --- a/app/Http/Controllers/SearchController.php +++ b/app/Http/Controllers/SearchController.php @@ -69,7 +69,6 @@ class SearchController extends Controller $ruleId = (int) $request->get('rule'); $rule = null; $ruleChanged = false; - $longQueryWarning = false; // find rule, check if query is different, offer to update. $ruleRepository = app(RuleRepositoryInterface::class); @@ -80,9 +79,6 @@ class SearchController extends Controller $ruleChanged = true; } } - if (strlen($fullQuery) > 250) { - $longQueryWarning = true; - } // parse search terms: $searcher->parseQuery($fullQuery); @@ -92,7 +88,7 @@ class SearchController extends Controller $subTitle = (string) trans('breadcrumbs.search_result', ['query' => $fullQuery]); - return view('search.index', compact('query', 'longQueryWarning', 'operators', 'page', 'rule', 'fullQuery', 'subTitle', 'ruleId', 'ruleChanged')); + return view('search.index', compact('query', 'operators', 'page', 'rule', 'fullQuery', 'subTitle', 'ruleId', 'ruleChanged')); } /** diff --git a/resources/views/v1/search/index.twig b/resources/views/v1/search/index.twig index b3617e7884..384984d046 100644 --- a/resources/views/v1/search/index.twig +++ b/resources/views/v1/search/index.twig @@ -37,11 +37,6 @@ {% endif %} - {% if longQueryWarning %} -
- {{ 'long_query_warning'|_ }} -
- {% endif %} {% if '' != query %}{{ trans('firefly.search_for_query', {query: query|escape})|raw}} diff --git a/resources/views/v1/search/search.twig b/resources/views/v1/search/search.twig index c35bde96ae..4a3e8ddb0f 100644 --- a/resources/views/v1/search/search.twig +++ b/resources/views/v1/search/search.twig @@ -4,7 +4,7 @@ {% elseif 0 == groups.count() %} {{ trans_choice('firefly.search_found_transactions', 0, {time: searchTime}) }} {% else %} - {{ trans_choice('firefly.search_found_transactions', groups.perPage(), {time: searchTime}) }} + {{ trans_choice('firefly.search_found_transactions', groups.count(), {time: searchTime}) }} {% endif %}