IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix https://github.com/firefly-iii/firefly-iii/issues/6009

Browse Source
This commit is contained in:
James Cole 2022-05-04 20:49:54 +02:00
parent 610bc9f4bc
commit 5e7ee8c5bf
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/Helpers/Collector/Extensions/AttachmentCollection.php
View File

@ -27,6 +27,7 @@ namespace FireflyIII\Helpers\Collector\Extensions;
use FireflyIII\Helpers\Collector\GroupCollectorInterface; use FireflyIII\Helpers\Collector\GroupCollectorInterface;
use FireflyIII\Models\Attachment; use FireflyIII\Models\Attachment;
use FireflyIII\Models\TransactionJournal; use FireflyIII\Models\TransactionJournal;
use Illuminate\Database\Eloquent\Builder;
use Illuminate\Database\Eloquent\Builder as EloquentBuilder; use Illuminate\Database\Eloquent\Builder as EloquentBuilder;
use Log; use Log;
@ -299,7 +300,19 @@ trait AttachmentCollection
{ {
Log::debug('Add filter on no attachments.'); Log::debug('Add filter on no attachments.');
$this->joinAttachmentTables(); $this->joinAttachmentTables();
$this->query->whereNull('attachments.attachable_id');
$this->query->where(function (Builder $q1) {
$q1
->whereNull('attachments.attachable_id')
->orWhere(function (Builder $q2) {
$q2
->whereNotNull('attachments.attachable_id')
->whereNotNull('attachments.deleted_at');
// id is not null
// deleted at is not null.
});
});
return $this; return $this;
} }