kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-12-18 20:38:57 +00:00
Code Issues Projects Releases Wiki Activity

Tweak UI

Browse Source
This commit is contained in:
Sobuno
2025-01-03 00:45:19 +01:00
parent 36ec1daf3a
commit e33e3cc40f
5 changed files with 31 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -83,13 +83,13 @@ class SearchController extends Controller
$searcher->parseQuery($fullQuery);
// words from query and operators:
$query = $searcher->getWordsAsString();
$excludedWords = $searcher->getExcludedWordsAsString();
$words = $searcher->getWords();
$excludedWords = $searcher->getExcludedWords();
$operators = $searcher->getOperators();
$invalidOperators = $searcher->getInvalidOperators();
$subTitle = (string) trans('breadcrumbs.search_result', ['query' => $fullQuery]);
return view('search.index', compact('query', 'excludedWords', 'operators', 'page', 'rule', 'fullQuery', 'subTitle', 'ruleId', 'ruleChanged', 'invalidOperators'));
return view('search.index', compact('words', 'excludedWords', 'operators', 'page', 'rule', 'fullQuery', 'subTitle', 'ruleId', 'ruleChanged', 'invalidOperators'));
}
/**

19
app/Support/Search/OperatorQuerySearch.php
View File

@@ -123,9 +123,14 @@ class OperatorQuerySearch implements SearchInterface
return implode(' ', $this->words);
}
public function getExcludedWordsAsString(): string
public function getWords(): array
{
return implode(' ', $this->prohibitedWords);
return $this->words;
}
public function getExcludedWords(): array
{
return $this->prohibitedWords;
}
/**
@@ -2826,16 +2831,6 @@ class OperatorQuerySearch implements SearchInterface
}
}
public function getWords(): array
{
return $this->words;
}
public function getExcludedWords(): array
{
return $this->prohibitedWords;
}
public function setDate(Carbon $date): void
{
$this->date = $date;

3
app/Support/Search/SearchInterface.php
View File

@@ -38,9 +38,10 @@ interface SearchInterface
public function getModifiers(): Collection;
public function getOperators(): Collection;
public function getWords(): array;
public function getWordsAsString(): string;
public function getExcludedWordsAsString(): string;
public function getExcludedWords(): array;
public function hasModifiers(): bool;