From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Fri, 3 Apr 2020 14:48:30 +0000 (+0200)
Subject: wip #3546 @1
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=b3ab0b90f41ae50b67e7e1707c33b67ac40623b5;p=cubist_cms-back.git

wip #3546 @1
---

diff --git a/src/app/Magic/Controllers/CubistMagicController.php b/src/app/Magic/Controllers/CubistMagicController.php
index f3c1e77..6f37203 100644
--- a/src/app/Magic/Controllers/CubistMagicController.php
+++ b/src/app/Magic/Controllers/CubistMagicController.php
@@ -155,6 +155,7 @@ class CubistMagicController extends CubistCrudController
     protected function _prepareCRUDData()
     {
         $request = $this->crud->validateRequest();
+
         $appendComposite = [];
         foreach ($request->all() as $field => $content) {
             $initialContent = $content;
@@ -162,10 +163,6 @@ class CubistMagicController extends CubistCrudController
 
             $change = false;
             $unsetInitial = false;
-            if (is_array($content)) {
-                $content = json_encode($content);
-                $change = true;
-            }
             $e = explode('___', $field);
             if (count($e) > 1) {
                 $change = false;
diff --git a/src/app/Magic/Fields/RolesPermissions.php b/src/app/Magic/Fields/RolesPermissions.php
index 5b39440..a1ffc0d 100644
--- a/src/app/Magic/Fields/RolesPermissions.php
+++ b/src/app/Magic/Fields/RolesPermissions.php
@@ -8,7 +8,7 @@ use Cubist\Backpack\app\Magic\Models\CubistMagicAbstractModel;
 class RolesPermissions extends Field
 {
     protected $_adminType = 'checklist_dependency';
-    protected $_cast = ['roles' => 'array', 'permissions' => 'array'];
+    protected $_cast = ['roles' => 'json', 'permissions' => 'json'];
 
     public function getDefinition()
     {
diff --git a/src/app/Magic/Models/CubistMagicAbstractModel.php b/src/app/Magic/Models/CubistMagicAbstractModel.php
index 8c5e1e1..62f461f 100644
--- a/src/app/Magic/Models/CubistMagicAbstractModel.php
+++ b/src/app/Magic/Models/CubistMagicAbstractModel.php
@@ -260,13 +260,13 @@ class CubistMagicAbstractModel extends Model implements HasMedia
             if ($field->getAttribute('hidden')) {
                 $this->hidden[] = $name;
             }
-            $cast=$field->getAttribute('cast', false)
-            if ($cast!== false) {
-                if(is_array($cast)){
-                    foreach ($cast as $name=>$type) {
+            $cast = $field->getAttribute('cast', false);
+            if ($cast !== false) {
+                if (is_array($cast)) {
+                    foreach ($cast as $name => $type) {
                         $this->casts[$name] = $type;
                     }
-                }else {
+                } else {
                     $this->casts[$field->getAttribute('name')] = $cast;
                 }
             }