wip #3439 @0.25

diff --git a/src/app/Http/Controllers/CubistCrudController.php b/src/app/Http/Controllers/CubistCrudController.php
index 2cd3fd36acd895883ce4697d24014a1ea9014cd8..e638d7d538022851c1e018ebfeae8e82e344cee6 100644 (file)
--- a/src/app/Http/Controllers/CubistCrudController.php
+++ b/src/app/Http/Controllers/CubistCrudController.php
@@ -5,10 +5,27 @@ namespace Cubist\Backpack\app\Http\Controllers;
 
 
 use Backpack\CRUD\app\Http\Controllers\CrudController;
+use Backpack\CRUD\app\Http\Controllers\Operations\BulkCloneOperation;
+use Backpack\CRUD\app\Http\Controllers\Operations\BulkDeleteOperation;
+use Backpack\CRUD\app\Http\Controllers\Operations\CloneOperation;
+use Backpack\CRUD\app\Http\Controllers\Operations\CreateOperation;
+use Backpack\CRUD\app\Http\Controllers\Operations\DeleteOperation;
+use Backpack\CRUD\app\Http\Controllers\Operations\ListOperation;
+use Backpack\CRUD\app\Http\Controllers\Operations\RevisionsOperation;
+use Backpack\CRUD\app\Http\Controllers\Operations\UpdateOperation;
 use Cubist\Backpack\CubistCrudPanel;
 
 class CubistCrudController extends CrudController
 {
+    use ListOperation;
+    use CreateOperation;
+    use UpdateOperation;
+    use DeleteOperation;
+    use BulkDeleteOperation;
+    use CloneOperation;
+    use BulkCloneOperation;
+    use RevisionsOperation;
+
     public function __construct()
     {
         if ($this->crud) {

diff --git a/src/app/Magic/Controllers/CubistMagicController.php b/src/app/Magic/Controllers/CubistMagicController.php
index f746b723673a151a3ecc65dc714fcb486a0676b2..ab3771d0c5f5e47406ae643929dd5a1e560a9322 100644 (file)
--- a/src/app/Magic/Controllers/CubistMagicController.php
+++ b/src/app/Magic/Controllers/CubistMagicController.php
@@ -3,15 +3,6 @@
 
 namespace Cubist\Backpack\app\Magic\Controllers;
 
-use Backpack\CRUD\app\Http\Controllers\Operations\BulkCloneOperation;
-use Backpack\CRUD\app\Http\Controllers\Operations\BulkDeleteOperation;
-use Backpack\CRUD\app\Http\Controllers\Operations\CloneOperation;
-use Backpack\CRUD\app\Http\Controllers\Operations\CreateOperation;
-use Backpack\CRUD\app\Http\Controllers\Operations\DeleteOperation;
-use Backpack\CRUD\app\Http\Controllers\Operations\ListOperation;
-use Backpack\CRUD\app\Http\Controllers\Operations\RevisionsOperation;
-use Backpack\CRUD\app\Http\Controllers\Operations\UpdateOperation;
-use Backpack\CRUD\app\Models\Traits\CrudTrait;
 use Cubist\Backpack\app\Http\Controllers\CubistCrudController;
 use Cubist\Backpack\app\Magic\Fields\Field;
 use Cubist\Backpack\app\Magic\Menu\Menu;
@@ -32,15 +23,6 @@ class CubistMagicController extends CubistCrudController
 {
     use HandleAjaxMedia;
 
-    use ListOperation;
-    use CreateOperation;
-    use UpdateOperation;
-    use DeleteOperation;
-    use BulkDeleteOperation;
-    use CloneOperation;
-    use BulkCloneOperation;
-    use RevisionsOperation;
-
     protected $_modelNamespace;
     protected $_routeURL;
     protected $_singular;
@@ -203,12 +185,11 @@ class CubistMagicController extends CubistCrudController
     }
 
     /**
-     * @param CubistMagicRequest $request
      * @return CubistMagicRequest
      */
-    protected function _prepareCRUDData(CubistMagicRequest $request)
+    protected function _prepareCRUDData()
     {
-
+        $request = $this->crud->validateRequest();
         $appendComposite = [];
         foreach ($request->all() as $field => $content) {
             $initialContent = $content;
@@ -247,14 +228,13 @@ class CubistMagicController extends CubistCrudController
     }
 
     /**
-     * @param CubistMagicStoreRequest $request
      * @return \Illuminate\Database\Eloquent\Model|\Illuminate\Http\RedirectResponse
      */
-    public function store(CubistMagicStoreRequest $request)
+    public function store()
     {
         $this->_forgetCache();
 
-        $request = $this->_prepareCRUDData($request);
+        $request = $this->_prepareCRUDData();
         $this->getModelInstance()->onBeforeStore($this, $request);
 
         // your additional operations before save here
@@ -268,11 +248,11 @@ class CubistMagicController extends CubistCrudController
      * @param CubistMagicUpdateRequest $request
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function update(CubistMagicUpdateRequest $request)
+    public function update()
     {
         $this->_forgetCache();
 
-        $request = $this->_prepareCRUDData($request);
+        $request = $this->_prepareCRUDData();
         $this->getModelInstance()->onBeforeUpdate($this, $request);
 
         // your additional operations before save here
@@ -359,19 +339,4 @@ class CubistMagicController extends CubistCrudController
         $this->_forgetCache();
         parent::saveReorder();
     }
-
-    public function setupListOperation()
-    {
-
-    }
-
-    public function setupCreateOperation()
-    {
-
-    }
-
-    public function setupUpdateOperation()
-    {
-
-    }
 }