mirror of
https://github.com/firefly-iii/firefly-iii.git
synced 2025-10-16 17:33:45 +00:00
Fix #7792
This commit is contained in:
@@ -49,6 +49,12 @@ trait CollectorProperties
|
||||
private array $postFilters;
|
||||
private HasMany $query;
|
||||
private array $stringFields;
|
||||
/*
|
||||
* This array is used to collect ALL tags the user may search for (using 'setTags').
|
||||
* This way the user can call 'setTags' multiple times and get a joined result.
|
||||
*
|
||||
*/
|
||||
private array $tags;
|
||||
private int $total;
|
||||
private ?User $user;
|
||||
}
|
||||
|
@@ -896,7 +896,8 @@ trait MetaCollection
|
||||
public function setTags(Collection $tags): GroupCollectorInterface
|
||||
{
|
||||
$this->withTagInformation();
|
||||
$this->query->whereIn('tag_transaction_journal.tag_id', $tags->pluck('id')->toArray());
|
||||
$this->tags = array_merge($this->tags, $tags->pluck('id')->toArray());
|
||||
$this->query->whereIn('tag_transaction_journal.tag_id', $this->tags);
|
||||
|
||||
return $this;
|
||||
}
|
||||
|
@@ -65,6 +65,7 @@ class GroupCollector implements GroupCollectorInterface
|
||||
public function __construct()
|
||||
{
|
||||
$this->postFilters = [];
|
||||
$this->tags = [];
|
||||
$this->user = null;
|
||||
$this->limit = null;
|
||||
$this->page = null;
|
||||
|
@@ -64,9 +64,9 @@ class RuleForm
|
||||
* @param null $value
|
||||
* @param array|null $options
|
||||
*
|
||||
* @return HtmlString
|
||||
* @return string
|
||||
*/
|
||||
public function ruleGroupListWithEmpty(string $name, $value = null, array $options = null): HtmlString
|
||||
public function ruleGroupListWithEmpty(string $name, $value = null, array $options = null): string
|
||||
{
|
||||
$options = $options ?? [];
|
||||
$options['class'] = 'form-control';
|
||||
@@ -85,6 +85,6 @@ class RuleForm
|
||||
}
|
||||
}
|
||||
|
||||
return Form::select($name, $array, $value, $options);
|
||||
return $this->select($name, $array, $value, $options);
|
||||
}
|
||||
}
|
||||
|
@@ -127,6 +127,7 @@ return [
|
||||
'start_date' => 'Start of range',
|
||||
'end_date' => 'End of range',
|
||||
'enddate' => 'End date',
|
||||
'move_rules_before_delete' => 'Rule group',
|
||||
'start' => 'Start of range',
|
||||
'end' => 'End of range',
|
||||
'delete_account' => 'Delete account ":name"',
|
||||
|
Reference in New Issue
Block a user