starred/panel-pelican-dev
1
0
Fork 0
mirror of https://github.com/pelican-dev/panel.git synced 2026-05-04 18:00:48 +03:00
Code Issues 41 Packages Projects Releases 10 Wiki Activity

Merge branch 'main' into lance/pint-fixes

Browse Source
This commit is contained in:
Lance Pioch
2024-10-20 11:53:10 -04:00
committed by GitHub
parent deb6603840 020e41cbbc
commit 64943aa50c
78 changed files with 274 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/Models/ActivityLogSubject.php
View File

@@ -3,8 +3,9 @@
namespace App\Models;
use Illuminate\Database\Eloquent\Relations\BelongsTo;
use Illuminate\Database\Eloquent\Relations\MorphTo;
use Illuminate\Database\Eloquent\Relations\Pivot;
use Illuminate\Database\Eloquent\SoftDeletes;
use Illuminate\Database\Eloquent\SoftDeletingScope;
/**
* \App\Models\ActivityLogSubject.
@@ -37,15 +38,8 @@ class ActivityLogSubject extends Pivot
return $this->belongsTo(ActivityLog::class);
}
public function subject()
public function subject(): MorphTo
{
$morph = $this->morphTo();
if (in_array(SoftDeletes::class, class_uses_recursive($morph::class))) {
/** @var self|Backup|UserSSHKey $morph - cannot use traits in doc blocks */
return $morph->withTrashed();
}
return $morph;
return $this->morphTo()->withoutGlobalScope(SoftDeletingScope::class);
}
}