piw

Author: khanzadimahdi

src/Models/Permission.php

@@ -60,7 +60,7 @@ function ($model) use ($relationModel) {
     public function roles() : MorphToMany
     {
         return $this
-            ->morphedByMany(config('admission.models.roles'), 'permissionable')
+            ->morphedByMany(config('admission.models.role'), 'permissionable')
             ->withPivot('from', 'until')
             ->withTimestamps();
     }

src/Traits/HasPermissions.php

@@ -223,6 +223,16 @@ public function hasPermissionViaRole(PermissionContract $permission)
         return $this->hasRole($permission->roles);
     }
 
+    /**
+     * General action matches with all other actions
+     *
+     * @return string
+     */
+    protected function generalAction()
+    {
+        return '*';
+    }
+
     /**
      * Determine if the model has permission to run an action over given entity.
      *
@@ -234,10 +244,13 @@ public function hasPermissionViaRole(PermissionContract $permission)
     public function hasPermissionTo($action, $entity = null) : bool
     {
         $entity = array_pop($entity);
-
         $permission = $this
             ->getPermissionModel()
-            ->where('action', '=', $action)
+            ->where(function($query) use ($action) {
+                $query
+                    ->where('action', '=', $action)
+                    ->orWhere('action', '=', $this->generalAction());
+            })
             ->when(
                 !empty($entity),
                 function ($query) use ($entity) {
@@ -246,8 +259,8 @@ function ($query) use ($entity) {
                         $entityName = array_search($entityClassName, Relation::$morphMap);
 
                         $query
-                            ->where('name', '=', $entityClassName)
-                            ->orWhere('name', '=', $entityName);
+                            ->where('entity_type', '=', $entityClassName)
+                            ->orWhere('entity_type', '=', $entityName);
                     });
 
                     if (is_object($entity) && !empty($entity->id)) {