diff --git a/CHANGELOG.md b/CHANGELOG.md index 755f10e5..6d3ed2e9 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,9 @@ All Notable changes to `spatie/laravel-activitylog` will be documented in this file +## 1.4.0 - 2016-08-10 +- Added support for soft deletes + ## 1.3.2 - 2016-08-09 - This version replaces version `1.3.0` - Dropped L5.1 compatibility diff --git a/README.md b/README.md index 331f6b56..1ad352f9 100644 --- a/README.md +++ b/README.md @@ -141,7 +141,7 @@ return [ /** * When set to true, the subject returns soft deleted models */ - 'subject_withTrashed' => false + 'subject_returns_soft_deleted_models' => false ]; ``` diff --git a/config/laravel-activitylog.php b/config/laravel-activitylog.php index a7951f0a..e80f1575 100644 --- a/config/laravel-activitylog.php +++ b/config/laravel-activitylog.php @@ -23,5 +23,5 @@ /** * When set to true, the subject returns soft deleted models */ - 'subject_withTrashed' => false, + 'subject_returns_soft_deleted_models' => false, ]; diff --git a/src/Models/Activity.php b/src/Models/Activity.php index fb408a63..4eb40a4d 100644 --- a/src/Models/Activity.php +++ b/src/Models/Activity.php @@ -19,8 +19,10 @@ class Activity extends Eloquent public function subject(): MorphTo { - if (config('laravel-activitylog.subject_withTrashed')) - return $this->morphTo()->withTrashed(); + if (config('laravel-activitylog.subject_returns_soft_deleted_models')) { + return $this->morphTo()->withTrashed(); + } + return $this->morphTo(); } diff --git a/tests/LogsActivityTest.php b/tests/LogsActivityTest.php index 4dbdb50f..ed77aaec 100644 --- a/tests/LogsActivityTest.php +++ b/tests/LogsActivityTest.php @@ -77,10 +77,10 @@ public function it_can_fetch_all_activity_for_a_model() } /** @test */ - public function it_can_fetch_all_activity_for_a_deleted_model() + public function it_can_fetch_soft_deleted_models() { - $this->app['config']->set('laravel-activitylog.subject_withTrashed', true); - + $this->app['config']->set('laravel-activitylog.subject_returns_soft_deleted_models', true); + $article = $this->createArticle(); $article->name = 'changed name'; diff --git a/tests/Models/Article.php b/tests/Models/Article.php index 0f6380a2..2fd7ed16 100644 --- a/tests/Models/Article.php +++ b/tests/Models/Article.php @@ -8,7 +8,7 @@ class Article extends Model { use SoftDeletes; - + protected $table = 'articles'; protected $guarded = [];