Merge pull request #10 from tomatophp/develop

fix button permission with method
tomatophp · Feb 7, 2024 · e38587f · e38587f
2 parents 6cad2c9 + c044024
commit e38587f
Showing 1 changed file with 11 additions and 6 deletions.
diff --git a/src/Views/Button.php b/src/Views/Button.php
@@ -30,7 +30,7 @@ public function __construct(
      */
     public function render()
     {
-        return function (array $data) {
+        $checkPermission = function (array $data) {
             if(isset($data['attributes']) && isset($data['attributes']['href'])){
                 $route = \Route::getRoutes()->match(Request::create($this->attributes->getAttributes()['href']))->getName();
                 if(class_exists(\Spatie\Permission\Models\Role::class)){
@@ -41,20 +41,25 @@ public function render()
                 }
 
                 if($permission && auth('web')->user() && auth('web')->user()->can($permission->name)){
-                    return 'tomato-admin::components.button';
+                    return true;
                 }
                 else if(!$permission){
-                    return 'tomato-admin::components.button';
+                    return true;
                 }
                 else {
-                    return '';
+                    return false;
                 }
             }
             else {
-                return 'tomato-admin::components.button';
+                return true;
             }
         };
 
-
+        if($checkPermission){
+            return view('tomato-admin::components.button');
+        }
+        else {
+            return '';
+        }
     }
 }