From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Wed, 14 Feb 2024 09:42:12 +0000 (+0100)
Subject: wip #6727 @0.25
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=9f480bbad32cb319f1e487b3ca381176d7b2197d;p=cubist_cms-back.git

wip #6727 @0.25
---

diff --git a/src/app/Magic/Models/CubistMagicAbstractModel.php b/src/app/Magic/Models/CubistMagicAbstractModel.php
index d99f613..13062f2 100644
--- a/src/app/Magic/Models/CubistMagicAbstractModel.php
+++ b/src/app/Magic/Models/CubistMagicAbstractModel.php
@@ -710,6 +710,7 @@ class CubistMagicAbstractModel extends Model implements HasMedia
 
         $res = new PageData();
         $res->setEntity($this);
+        $keys = [];
         foreach ($this->attributes as $key => $value) {
             $v = $this->getAttributeValue($key);
             if ($v instanceof Carbon) {
@@ -717,7 +718,21 @@ class CubistMagicAbstractModel extends Model implements HasMedia
                 continue;
             }
             $res->set($key, Json::decodeRecursive($v, Json::TYPE_ARRAY));
+            $keys[] = $key;
         }
+
+        foreach ($this->getFields() as $field) {
+            $name = $field->getName();
+            if (in_array($name, $keys)) {
+                continue;
+            }
+            $default = $field->getAttribute('default');
+            if (null === $default) {
+                continue;
+            }
+            $res->set($name, $default);
+        }
+
         return $res;
     }