jev/opensem
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor fixes, coding standards

Browse Source
This commit is contained in:
Ludovic CANDELLIER
2021-11-01 00:50:10 +01:00
parent 0d0e4deb16
commit e97f54f126
47 changed files with 133 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Models/Core/Auth/PasswordSecurity.php
View File

@@ -12,7 +12,7 @@ class PasswordSecurity extends Model
* @var array
*/
protected $fillable = [
'user_id', 'password_expiry_days', 'password_updated_at'
'user_id', 'password_expiry_days', 'password_updated_at',
];
// set relation

10
app/Models/Core/Auth/User.php
View File

@@ -40,16 +40,14 @@ class User extends parentUser
public function teams()
{
return $this->hasManyThrough(\App\Models\Core\Auth\Team::class, \App\Models\Core\Auth\TeamUser::class, 'user_id', 'id', 'id', 'team_id');
return $this->hasManyThrough(Team::class, TeamUser::class, 'user_id', 'id', 'id', 'team_id');
}
public function scopeByTeam($query, $id)
{
return $query->whereHas(
'teams', function ($query) use ($id) {
$query->where('id', $id);
}
);
return $query->whereHas('teams', function ($query) use ($id) {
$query->where('id', $id);
});
}
public function scopeByUniqueTeam($query)