Fixed bug

riteshjha · Aug 4, 2020 · 1d682a3 · 1d682a3
1 parent 276b173
commit 1d682a3
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/src/Commands/RecordAbility.php b/src/Commands/RecordAbility.php
@@ -54,13 +54,15 @@ public function handle()
 
         $modelNamespace = config('permission.model.namespace');
 
-        collect(glob(base_path($modelNamespace . '/*.php')))->map(function ($filename) use ($modelNamespace) {
+        $modelsPath = base_path(str_replace('\\', DIRECTORY_SEPARATOR, $modelNamespace ) . DIRECTORY_SEPARATOR . '*.php');
+
+        collect(glob($modelsPath))->map(function ($filename) use ($modelNamespace) {
 
             $modelWithNamespace = $modelNamespace . '\\' . basename($filename, '.php');
 
             if(in_array('Rkj\Permission\Contracts\Permissionable', class_implements($modelWithNamespace))){
 
-                $fields = (new $modelWithNamespace)->fieldAbilities();
+                $fields = (new $modelWithNamespace)->getFieldAbilities();
 
                 foreach($fields as $field){
                     $group = Permission::GROUP_ACCOUNT;

diff --git a/src/Contracts/Permissionable.php b/src/Contracts/Permissionable.php
@@ -17,7 +17,7 @@ public function owner();
      *
      * @return array
      */
-    public function fieldAbilities();
+    public function getFieldAbilities();
 
     /**
      * Handle model level permision

diff --git a/src/Models/Traits/HasPermission.php b/src/Models/Traits/HasPermission.php
@@ -54,7 +54,7 @@ public function hasPermission($authUser, $ability, $level)
      *
      * @return array
      */
-    public function fieldAbilities()
+    public function getFieldAbilities()
     {
         return ($this->fieldAbilities)
                 ? collect($this->fieldAbilities)->transform(function($field){
@@ -73,7 +73,7 @@ public static function filterFieldAccess($data)
     {
         $model = new static;
 
-        $abilities = $model->fieldAbilities();
+        $abilities = $model->getFieldAbilities();
 
         if(count($abilities) <= 0) return $data;