jaro/ikea
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix bug childs menu is accesible when user not have permission

Browse Source
This commit is contained in:
Geriano
2022-08-01 07:58:09 +07:00
parent 57b028c80d
commit 992b8799d8
2 changed files with 38 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
app/Models/Menu.php
View File

@@ -2,6 +2,7 @@
namespace App\Models;
use Illuminate\Database\Eloquent\Builder;
use Illuminate\Database\Eloquent\Casts\Attribute;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
@@ -46,7 +47,27 @@ class Menu extends Model
*/
public function childs()
{
return $this->hasMany(Menu::class, 'parent_id', 'id')->with(['parent', 'childs'])->orderBy('position');
return $this->hasMany(Menu::class, 'parent_id', 'id')
->with(['parent', 'childs'])
->orderBy('position');
}
/**
* @return \Illuminate\Database\Eloquent\Relations\HasMany
*/
public function childsByPermissions()
{
return $this->hasMany(Menu::class, 'parent_id', 'id')
->where(function (Builder $query) {
$user = request()->user();
$permissions = $user->permissions->pluck('id')->push(...$user->roles->pluck('permissions')->flatten()->pluck('id'));
$query->whereHas('permissions', function (Builder $query) use ($permissions) {
$query->whereIn('permissions.id', $permissions);
})->orDoesntHave('permissions');
})
->with(['parent', 'childsByPermissions'])
->orderBy('position');
}
/**

20
app/Models/User.php
View File

@@ -72,12 +72,24 @@ class User extends Authenticatable
{
return Menu::whereNull('parent_id')
->where(function (Builder $query) {
$query->whereHas('permissions', function (Builder $query) {
$query->whereIn('permissions.id', $this->permissions->pluck('id')->push(...$this->roles->pluck('permissions')->flatten()->pluck('id')));
$permissions = $this->permissions->pluck('id')->push(...$this->roles->pluck('permissions')->flatten()->pluck('id'));
$query->whereHas('permissions', function (Builder $query) use ($permissions) {
$query->whereIn('permissions.id', $permissions);
})->orDoesntHave('permissions');
})
->orderBy('position')
->with('childs')
->get();
->with('childsByPermissions')
->get()
->each([$this, 'changeChildsByPermissionsToChilds']);
}
/**
* @param \App\Models\Menu $menu
* @return void
*/
public function changeChildsByPermissionsToChilds(Menu $menu)
{
$menu->childs = collect($menu->childsByPermissions)->each([$this, 'changeChildsByPermissionsToChilds']);
}
}