From 3947ebcefe1e842c3925c50fc9594e7a77bdd4c0 Mon Sep 17 00:00:00 2001 From: Nafies Luthfi Date: Wed, 19 Jul 2017 17:29:01 +0800 Subject: [PATCH] Remove Permission model Permission will be replaced by model policy --- app/Entities/Users/HasRoles.php | 11 ----------- app/Entities/Users/Permission.php | 23 ----------------------- app/Entities/Users/Role.php | 21 --------------------- 3 files changed, 55 deletions(-) delete mode 100644 app/Entities/Users/Permission.php diff --git a/app/Entities/Users/HasRoles.php b/app/Entities/Users/HasRoles.php index 35f878b..188ecdf 100644 --- a/app/Entities/Users/HasRoles.php +++ b/app/Entities/Users/HasRoles.php @@ -43,17 +43,6 @@ trait HasRoles return !! $role->intersect($this->roles)->count(); } - /** - * Determine if the user may perform the given permission. - * - * @param Permission $permission - * @return boolean - */ - public function hasPermission(Permission $permission) - { - return $this->hasRole($permission->roles); - } - public function hasRoles(array $roleNameArray) { return $this->roles->contains(function($role, $key) use ($roleNameArray) { diff --git a/app/Entities/Users/Permission.php b/app/Entities/Users/Permission.php deleted file mode 100644 index af9a98b..0000000 --- a/app/Entities/Users/Permission.php +++ /dev/null @@ -1,23 +0,0 @@ -belongsToMany(Role::class, 'user_role_permission'); - } -} diff --git a/app/Entities/Users/Role.php b/app/Entities/Users/Role.php index 78bca36..54a33a5 100755 --- a/app/Entities/Users/Role.php +++ b/app/Entities/Users/Role.php @@ -11,27 +11,6 @@ class Role extends Model protected $fillable = ['type','name','label']; public $timestamps = false; - /** - * A role may be given various permissions. - * - * @return \Illuminate\Database\Eloquent\Relations\BelongsToMany - */ - public function permissions() - { - return $this->belongsToMany(Permission::class, 'user_role_permission'); - } - - /** - * Grant the given permission to a role. - * - * @param Permission $permission - * @return mixed - */ - public function givePermissionTo(Permission $permission) - { - return $this->permissions()->save($permission); - } - public function users() { return $this->belongsToMany(User::class, 'role_user');