mirror_php/LinkAce
1
0
Fork 0
mirror of https://github.com/Kovah/LinkAce.git synced 2025-04-22 07:52:43 +02:00
Code Issues Releases Wiki Activity

Fix wrong merge

Browse Source
This commit is contained in:
Kovah 2022-06-10 17:36:13 +02:00
parent 92c179a4e9
commit 65298fe9aa
No known key found for this signature in database
GPG Key ID: AAAA031BA9830D7B
3 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/Models/Link.php
View File

@ -109,13 +109,16 @@ class Link extends Model implements Auditable
/**
* Scope for the user relation
*
* @param Builder $query
* @param int $userId
* @param Builder $query
* @param int|null $user_id
* @return Builder
*/
public function scopeByUser(Builder $query, int $userId): Builder
public function scopeByUser(Builder $query, int $user_id = null): Builder
{
return $query->where('user_id', $userId);
if (is_null($user_id) && auth()->check()) {
$user_id = auth()->id();
}
return $query->where('user_id', $user_id);
}
/**

9
app/Models/LinkList.php
View File

@ -81,12 +81,15 @@ class LinkList extends Model implements Auditable
/**
* Scope for the user relation
*
* @param Builder $query
* @param int $user_id
* @param Builder $query
* @param int|null $user_id
* @return Builder
*/
public function scopeByUser(Builder $query, int $user_id): Builder
public function scopeByUser(Builder $query, int $user_id = null): Builder
{
if (is_null($user_id) && auth()->check()) {
$user_id = auth()->id();
}
return $query->where('user_id', $user_id);
}

9
app/Models/Tag.php
View File

@ -76,12 +76,15 @@ class Tag extends Model implements Auditable
/**
* Scope for the user relation
*
* @param Builder $query
* @param int $user_id
* @param Builder $query
* @param int|null $user_id
* @return Builder
*/
public function scopeByUser(Builder $query, int $user_id): Builder
public function scopeByUser(Builder $query, int $user_id = null): Builder
{
if (is_null($user_id) && auth()->check()) {
$user_id = auth()->id();
}
return $query->where('user_id', $user_id);
}