wip

src/BackpackServiceProvider.php

@@ -85,7 +85,7 @@ public function register()
         $this->registerBackpackErrorViews();
 
         // Bind the CrudPanel object to Laravel's service container
-        $this->app->scoped('crud', function ($app) {
+        $this->app->bind('crud', function ($app) {
             // loop the stack trace to find the CrudControllerContract that called this method
             $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
             $controller = null;

src/app/Http/Controllers/CrudController.php

@@ -20,7 +20,8 @@ class CrudController extends Controller implements CrudControllerContract
 {
     use DispatchesJobs, ValidatesRequests;
 
-    public $crud;
+    //public $crud;
+
     public $data = [];
 
     public function __construct()
@@ -44,7 +45,7 @@ public function __construct()
 
     public function initializeCrud($request, $operation = null)
     {
-        $this->crud = Backpack::crud($this)->setRequest($request);
+        Backpack::crud($this)->setRequest($request);
         $this->setupDefaults();
         $this->setup();
         $this->setupConfigurationForCurrentOperation($operation);
@@ -127,4 +128,14 @@ protected function setupConfigurationForCurrentOperation(?string $operation = nu
             $this->{$setupClassName}();
         }
     }
+
+    public function __get($name)
+    {
+        if ($name == 'crud') {
+            return Backpack::getControllerCrud(get_class($this));
+        }
+
+        return $this->{$name};
+    }
+
 }

src/app/Library/CrudPanel/CrudButton.php

@@ -2,6 +2,8 @@
 
 namespace Backpack\CRUD\app\Library\CrudPanel;
 
+use Backpack\CRUD\app\Http\Controllers\CrudController;
+use Backpack\CRUD\Backpack;
 use Backpack\CRUD\ViewNamespaces;
 use Illuminate\Contracts\Support\Arrayable;
 use Illuminate\Support\Traits\Conditionable;
@@ -297,10 +299,10 @@ public function section($stack)
      * @param  object|null  $entry  The eloquent Model for the current entry or null if no current entry.
      * @return \Illuminate\Contracts\View\View
      */
-    public function getHtml($entry = null)
+    public function getHtml($entry = null, $crud = null)
     {
         $button = $this;
-        $crud = $this->crud();
+        $crud = $crud ?? $this->crud();
 
         if ($this->type == 'model_function') {
             if (is_null($entry)) {
@@ -434,7 +436,7 @@ public function collection()
     /**
      * Access the global CrudPanel object.
      *
-     * @return \Backpack\CRUD\app\Library\CrudPanel\CrudPanel
+     * @return CrudPanel
      */
     public function crud()
     {

src/resources/views/crud/inc/button_stack.blade.php

@@ -1,5 +1,5 @@
 @if ($crud->buttons()->where('stack', $stack)->count())
 	@foreach ($crud->buttons()->where('stack', $stack) as $button)
-	  {!! $button->getHtml($entry ?? null) !!}
+	  {!! $button->getHtml($entry ?? null, $crud) !!}
 	@endforeach
 @endif