From 194355dbd6dd8650bf167780365e987ef40e18c0 Mon Sep 17 00:00:00 2001
From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Wed, 26 Feb 2020 18:58:20 +0100
Subject: [PATCH] wip #3439 @1

---
 src/app/CubistCrudRouter.php                  | 35 -------------------
 .../Controllers/CubistMagicController.php     | 28 ++++++++++++++-
 src/app/Magic/Fields/Locale.php               |  2 +-
 .../Magic/Models/CubistMagicAbstractModel.php |  2 +-
 4 files changed, 29 insertions(+), 38 deletions(-)
 delete mode 100644 src/app/CubistCrudRouter.php

diff --git a/src/app/CubistCrudRouter.php b/src/app/CubistCrudRouter.php
deleted file mode 100644
index 212f462..0000000
--- a/src/app/CubistCrudRouter.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-
-
-namespace Cubist\Backpack;
-
-use Backpack\CRUD\CrudRouter;
-
-use Illuminate\Support\Facades\Route;
-
-class CubistCrudRouter extends CrudRouter
-{
-    public function __construct($name, $controller, $options)
-    {
-        parent::__construct($name, $controller, $options);
-
-        Route::post($this->name . '/bulk-publish', [
-            'as' => 'crud.' . $this->name . '.bulkPublish',
-            'uses' => $this->controller . '@bulkPublish',
-        ]);
-
-        Route::post($this->name . '/bulk-offline', [
-            'as' => 'crud.' . $this->name . '.bulkOffline',
-            'uses' => $this->controller . '@bulkOffline',
-        ]);
-
-        Route::post($this->name . '/bulk-translations-replace', [
-            'as' => 'crud.' . $this->name . '.bulkTranslationsReplace',
-            'uses' => $this->controller . '@bulkTranslationsReplace',
-        ]);
-
-        Route::match(['post'], $this->name . '/{id}/media', $this->controller . '@uploadMedia');
-        Route::match(['delete'], $this->name . '/{id}/media/{mediaId}', $this->controller . '@deleteMedia');
-        Route::match(['post'], $this->name . '/{id}/media/reorder', $this->controller . '@reorderMedia');
-    }
-}
diff --git a/src/app/Magic/Controllers/CubistMagicController.php b/src/app/Magic/Controllers/CubistMagicController.php
index b22fbf5..3480c34 100644
--- a/src/app/Magic/Controllers/CubistMagicController.php
+++ b/src/app/Magic/Controllers/CubistMagicController.php
@@ -19,6 +19,7 @@ use Illuminate\Support\Arr;
 use Illuminate\Support\Facades\App;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\Redirect;
+use Illuminate\Support\Facades\Route;
 
 class CubistMagicController extends CubistCrudController
 {
@@ -37,6 +38,31 @@ class CubistMagicController extends CubistCrudController
         parent::__construct();
     }
 
+    // Routes
+//Route::post($this->name . '/bulk-publish', [
+////'as' => 'crud.' . $this->name . '.bulkPublish',
+////'uses' => $this->controller . '@bulkPublish',
+////]);
+////
+////Route::post($this->name . '/bulk-offline', [
+////'as' => 'crud.' . $this->name . '.bulkOffline',
+////'uses' => $this->controller . '@bulkOffline',
+////]);
+////
+////Route::post($this->name . '/bulk-translations-replace', [
+////'as' => 'crud.' . $this->name . '.bulkTranslationsReplace',
+////'uses' => $this->controller . '@bulkTranslationsReplace',
+////]);
+///
+///
+
+    public function setupMediaRoutes($segment, $routeName, $controller)
+    {
+        Route::match(['post'], $segment . '/{id}/media', $controller . '@uploadMedia');
+        Route::match(['delete'], $segment . '/{id}/media/{mediaId}', $controller . '@deleteMedia');
+        Route::match(['post'], $segment . '/{id}/media/{mediaId}', $controller . '@reorderMedia');
+    }
+
     public function _postSetModel()
     {
 
@@ -147,7 +173,7 @@ class CubistMagicController extends CubistCrudController
         }
         $this->crud->addField($field->getDefinition(), $field->getCRUDForm());
 
-        $this->crud->orderFields(['id','variant']);
+        $this->crud->orderFields(['id', 'variant']);
 
         $this->_fields[$field->getAttribute('name')] = $field;
     }
diff --git a/src/app/Magic/Fields/Locale.php b/src/app/Magic/Fields/Locale.php
index aa4366b..3f10aef 100644
--- a/src/app/Magic/Fields/Locale.php
+++ b/src/app/Magic/Fields/Locale.php
@@ -6,7 +6,7 @@ namespace Cubist\Backpack\app\Magic\Fields;
 
 use Illuminate\Support\Facades\App;
 
-class Locale extends SelectFromArray
+class LLocale extends SelectFromArray
 {
     public function __construct($attributes)
     {
diff --git a/src/app/Magic/Models/CubistMagicAbstractModel.php b/src/app/Magic/Models/CubistMagicAbstractModel.php
index c671c9b..685e2ef 100644
--- a/src/app/Magic/Models/CubistMagicAbstractModel.php
+++ b/src/app/Magic/Models/CubistMagicAbstractModel.php
@@ -2,7 +2,7 @@
 
 namespace Cubist\Backpack\app\Magic\Models;
 
-use Backpack\CRUD\CrudTrait;
+use Backpack\CRUD\app\Models\Traits\CrudTrait;
 use Cubist\Backpack\app\Magic\BunchOfFields;
 use Cubist\Backpack\app\Magic\Controllers\CubistMagicController;
 use Cubist\Backpack\app\Magic\EntityData;
-- 
2.39.5