From: Vincent Vanwaelscappel Date: Wed, 14 Dec 2022 16:26:59 +0000 (+0100) Subject: wip #56649 @0.25 X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=9462497811a8f7d05a91ecae87a03b463d2d7ec3;p=cubist_cms-back.git wip #56649 @0.25 --- diff --git a/src/app/Magic/EntityData.php b/src/app/Magic/EntityData.php index 1e50501..bc8376d 100644 --- a/src/app/Magic/EntityData.php +++ b/src/app/Magic/EntityData.php @@ -73,10 +73,14 @@ class EntityData extends Data public function getImageFile($offset, $conversionName = '') { /** @var Media $media */ - $media = $this->getMedia($offset)->get(0); - return $media->getPath($conversionName); + $media = $this->getMedia($offset); + if (!$media) { + return null; + } + return $media->get(0)->getPath($conversionName); } + public function getMediaURL($offset, $default = null) { return $this->getImageURL($offset, '', $default); diff --git a/src/app/Magic/Fields/Field.php b/src/app/Magic/Fields/Field.php index f578b7a..d6c7d66 100644 --- a/src/app/Magic/Fields/Field.php +++ b/src/app/Magic/Fields/Field.php @@ -155,7 +155,7 @@ class Field implements \ArrayAccess 'can' => $this->_can, 'can_write' => $this->_canWrite, 'auth' => $this->_auth, 'database_type' => $this->_databaseType, 'database_unique' => $this->_databaseUnique, 'database_index' => $this->_databaseIndex, 'database_default' => $this->_databaseDefault, 'database_length' => $this->_databaseLength, 'fake' => false, 'store_in' => 'extras', 'attributes' => [], - 'placeholder' => $this->_placeholder, 'pattern' => $this->_pattern, + 'placeholder' => $this->_placeholder, 'pattern' => $this->_pattern, 'class' => null, ]; } @@ -203,7 +203,7 @@ class Field implements \ArrayAccess protected function _getFieldAttributesKeys() { - return ['placeholder', 'rows', 'pattern']; + return ['placeholder', 'rows', 'pattern', 'class']; } protected function getFieldAttributes()