A free open source IT asset/license management system
Fixed history return
snipe6a39db7e47de
diff --git a/app/Models/SnipeModel.php b/app/Models/SnipeModel.phpindex 1d68d81b3b..5ace6563e2 100644--- a/app/Models/SnipeModel.php+++ b/app/Models/SnipeModel.php@@ -238,7 +238,7 @@ class SnipeModel extends Modelpublic function actionlog(){- return $this->hasMany(Actionlog::class, 'target_id')->where('target_type', '=', self::class)->orderBy('created_at', 'DESC')->withTrashed();+ return $this->hasMany(Actionlog::class, 'target_id')->where('target_type', '=', self::class);}/**diff --git a/app/Models/Traits/Loggable.php b/app/Models/Traits/Loggable.phpindex a7cd223c31..78be8fec17 100644--- a/app/Models/Traits/Loggable.php+++ b/app/Models/Traits/Loggable.php@@ -39,8 +39,13 @@ trait Loggablepublic function history(){- return $this->hasMany(Actionlog::class, 'item_id')- ->where('item_type', self::class);++ return $this->morphMany(Actionlog::class, 'item')+ ->orWhere(function ($query) {+ $query->where('target_type', '=', static::class)+ ->where('target_id', '=', $this->getKey());+ });+}public function getHistory(Request $request)