wip #3439 @1

diff --git a/src/app/CubistCrudPanel.php b/src/app/CubistCrudPanel.php
index 746ce59b6c33d3eab251f1853d86516d821538cc..c22ad29597cf93882050fbbf1a3fafd441523bfe 100644 (file)
--- a/src/app/CubistCrudPanel.php
+++ b/src/app/CubistCrudPanel.php
@@ -2,7 +2,7 @@
 
 namespace Cubist\Backpack;
 
-use Backpack\CRUD\CrudPanel;
+use Backpack\CRUD\app\Library\CrudPanel\CrudPanel;
 use Cubist\Backpack\app\Magic\Models\CubistMagicAbstractModel;
 
 /**

diff --git a/src/app/Magic/Controllers/CubistMagicController.php b/src/app/Magic/Controllers/CubistMagicController.php
index 8419ef18d3ef064c58a0dfba62344a4b6c85a14f..f746b723673a151a3ecc65dc714fcb486a0676b2 100644 (file)
--- a/src/app/Magic/Controllers/CubistMagicController.php
+++ b/src/app/Magic/Controllers/CubistMagicController.php
@@ -362,17 +362,16 @@ class CubistMagicController extends CubistCrudController
 
     public function setupListOperation()
     {
-        echo ":)";
+
     }
 
     public function setupCreateOperation()
     {
-        echo ":)";
+
     }
 
     public function setupUpdateOperation()
     {
-        echo ":)";
-    }
 
+    }
 }

diff --git a/src/app/Middleware/LocaleSelector.php b/src/app/Middleware/LocaleSelector.php
index f5af9cc4746fa36bacb07375b7bc85ba02e64f24..75876dd4d5adb4a2b349b461e3dfd092d284344e 100644 (file)
--- a/src/app/Middleware/LocaleSelector.php
+++ b/src/app/Middleware/LocaleSelector.php
@@ -29,7 +29,11 @@ class LocaleSelector extends CubistMiddleware
                 $this->can('backpack_translation')
             )
         ) {
-            $domain = $this->_getDomainByLocale(Locale::getLocaleData($defaultLocale));
+            $data = Locale::getLocaleData($defaultLocale);
+            if (null === $data) {
+                return $this->getResponse();
+            }
+            $domain = $this->_getDomainByLocale($data);
             // redirect to default locale
             if (null === $domain) {
                 abort(401);
@@ -54,6 +58,11 @@ class LocaleSelector extends CubistMiddleware
 
     protected function _getDomainByLocale($locale)
     {
+
+        if (null === $locale) {
+            return null;
+        }
+
         $domains = $locale->domains;
         if (is_string($locale->domains)) {
             $domains = json_decode($locale->domains, true);

diff --git a/src/resources/install/.env b/src/resources/install/.env
index 043de38f987cec17909653afef0990a97cdf9f6d..08dd814b10e526ac7487d25cb3246d47a5d1bf49 100644 (file)
--- a/src/resources/install/.env
+++ b/src/resources/install/.env
@@ -39,3 +39,5 @@ MAIL_FROM_NAME="${APP_NAME}"
 
 MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
 MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
+
+BACKPACK_LICENSE=LFDA-FLAM-8919-GF6B-60DE-2702

diff --git a/src/resources/install/app/Http/Kernel.php b/src/resources/install/app/Http/Kernel.php
index 8a7d3a9130ff5c81538a8f3de41c42b5bb0fb443..3ff225f43099a0039b355eff3e3e102c7ff34601 100644 (file)
--- a/src/resources/install/app/Http/Kernel.php
+++ b/src/resources/install/app/Http/Kernel.php
@@ -34,7 +34,7 @@ class Kernel extends HttpKernel
             \App\Http\Middleware\EncryptCookies::class,
             \Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,
             \Illuminate\Session\Middleware\StartSession::class,
-            \Backpack\Base\app\Http\Middleware\UseBackpackAuthGuardInsteadOfDefaultAuthGuard::class,
+            \Backpack\CRUD\app\Http\Middleware\UseBackpackAuthGuardInsteadOfDefaultAuthGuard::class,
             \Illuminate\Session\Middleware\AuthenticateSession::class,
             \Cubist\Backpack\app\Middleware\VariantSelector::class,
             \Cubist\Backpack\app\Middleware\LocaleSelector::class,