kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-30 10:33:30 +00:00
Code Issues Projects Releases Wiki Activity

Fix withoutExternalUrl query and add search modifiers

Browse Source 
Co-authored-by: JC5 <james@firefly-iii.org>
This commit is contained in:
George Hahn
2022-01-24 23:03:33 -07:00
parent 0a5908e4d8
commit ecda8eebf2
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/Helpers/Collector/Extensions/MetaCollection.php
View File

@@ -221,8 +221,12 @@ trait MetaCollection
$this->hasJoinedMetaTables = true; $this->hasJoinedMetaTables = true;
$this->query->leftJoin('journal_meta', 'transaction_journals.id', '=', 'journal_meta.transaction_journal_id'); $this->query->leftJoin('journal_meta', 'transaction_journals.id', '=', 'journal_meta.transaction_journal_id');
} }
$this->query->where('journal_meta.name', '=', 'external_url'); $this->query->where(function(Builder $q1) {
$this->query->whereNull('journal_meta.data'); $q1->where(function(Builder $q2) {
$q2->where('journal_meta.name', '=', 'external_url');
$q2->whereNull('journal_meta.data');
})->orWhereNull('journal_meta.name');
});
return $this; return $this;
} }

2
resources/lang/en_US/firefly.php
View File

@@ -291,6 +291,8 @@ return [
'search_modifier_created_on' => 'Transaction was created on ":value"', 'search_modifier_created_on' => 'Transaction was created on ":value"',
'search_modifier_updated_on' => 'Transaction was last updated on ":value"', 'search_modifier_updated_on' => 'Transaction was last updated on ":value"',
'search_modifier_external_id' => 'External ID is ":value"', 'search_modifier_external_id' => 'External ID is ":value"',
'search_modifier_no_external_url' => 'The transaction has no external URL',
'search_modifier_any_external_url' => 'The transaction must have a (any) external URL',
'search_modifier_internal_reference' => 'Internal reference is ":value"', 'search_modifier_internal_reference' => 'Internal reference is ":value"',
'search_modifier_description_starts' => 'Description is ":value"', 'search_modifier_description_starts' => 'Description is ":value"',
'search_modifier_description_ends' => 'Description ends with ":value"', 'search_modifier_description_ends' => 'Description ends with ":value"',