From 879e054d386123256d9f294031691e9d4e7537b1 Mon Sep 17 00:00:00 2001 From: DariusIII Date: Thu, 21 Sep 2017 15:58:03 +0200 Subject: [PATCH] Add relationship between User and UserRequest models --- Changelog | 1 + app/Models/User.php | 5 +++++ app/Models/UserRequest.php | 7 ++++++- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/Changelog b/Changelog index af77cf99b..09caffbd4 100755 --- a/Changelog +++ b/Changelog @@ -1,4 +1,5 @@ 2017-09-21 DariusIII + * Chg: Add relationship between User and UserRequest models * Chg: Possible fix for apiaccess limit problem * Chg: Use new column name and update User <-> UserRole relation and use it * Chg: Update Users table, rename role to user_roles_id diff --git a/app/Models/User.php b/app/Models/User.php index b1433b825..1a8b3254a 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -49,4 +49,9 @@ class User extends Authenticatable { return $this->belongsTo('App\Models\UserRole', 'user_roles_id'); } + + public function request() + { + return $this->hasMany('App\Models\UserRequest', 'id'); + } } diff --git a/app/Models/UserRequest.php b/app/Models/UserRequest.php index e5aaf7f65..428950274 100644 --- a/app/Models/UserRequest.php +++ b/app/Models/UserRequest.php @@ -21,5 +21,10 @@ class UserRequest extends Model */ public $timestamps = false; - protected $fillable = ['users_id', 'request', 'hosthash', 'timestamp']; + protected $fillable = ['id', 'users_id', 'request', 'hosthash', 'timestamp']; + + public function user() + { + return $this->hasMany('App\Models\User', 'users_id'); + } }