diff --git a/app/Http/Controllers/Bo/ActivityLogController.php b/app/Http/Controllers/Bo/ActivityLogController.php index 97d6605..f3e29e4 100644 --- a/app/Http/Controllers/Bo/ActivityLogController.php +++ b/app/Http/Controllers/Bo/ActivityLogController.php @@ -4,13 +4,11 @@ namespace App\Http\Controllers\Bo; use App\Http\Controllers\Controller; use App\Models\ActivityLog; -use App\Traits\Controllers\ChangesModelOrder; use App\Traits\Controllers\UpdateModelPublished; use Illuminate\Http\Request; class ActivityLogController extends Controller { - use ChangesModelOrder; use UpdateModelPublished; /** diff --git a/app/Models/User.php b/app/Models/User.php index 8dc7ebd..9ae673d 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -112,16 +112,4 @@ class User extends Authenticatable $model->password = Hash::make($model->password); } } - - // * RELATIONS - - /** - * Activities logs One-to-many relationship. - * - * @return \Illuminate\Database\Eloquent\Relations\HasMany - */ - public function activityLogs(): \Illuminate\Database\Eloquent\Relations\HasMany - { - return $this->hasMany(ActivityLog::class); - } } diff --git a/app/Traits/Models/ActivityLog.php b/app/Traits/Models/ActivityLog.php index 67973e1..b31941a 100644 --- a/app/Traits/Models/ActivityLog.php +++ b/app/Traits/Models/ActivityLog.php @@ -3,6 +3,7 @@ namespace App\Traits\Models; use App\Observers\ModelObserver; +use App\Models\ActivityLog as ActivityLogModel; /** * If there is a static function in a trait (named boot[TraitName]), @@ -20,4 +21,16 @@ trait ActivityLog { static::observe(ModelObserver::class); } + + // * RELATIONS + + /** + * Activities logs One-to-many relationship. + * + * @return \Illuminate\Database\Eloquent\Relations\HasMany + */ + public function activityLogs(): \Illuminate\Database\Eloquent\Relations\HasMany + { + return $this->hasMany(ActivityLogModel::class, 'model_id'); + } }