#2810

diff --git a/src/app/Magic/CubistMagicAttribute.php b/src/app/Magic/CubistMagicAttribute.php
index 2fbba50059743a2d62c4d4ce1a5cd4c5f0b3a453..04df7124783b7689ccde555cd09d570cf567f08a 100644 (file)
--- a/src/app/Magic/CubistMagicAttribute.php
+++ b/src/app/Magic/CubistMagicAttribute.php
@@ -16,7 +16,7 @@ trait CubistMagicAttribute
 
     public function hasAttribute($key)
     {
-        return isset($this->_attributes[$key]);
+        return isset($this->_attributes[$key]) && null !== $this->_attributes[$key];
     }
 
     public function setAttribute($key, $value)

diff --git a/src/app/Magic/Fields/Files.php b/src/app/Magic/Fields/Files.php
index 52c1c23cb6d6aa4757274935ad6b4c7d0c69fc2b..d8450388bdaa5e2720a0807980c34bfb22f06831 100644 (file)
--- a/src/app/Magic/Fields/Files.php
+++ b/src/app/Magic/Fields/Files.php
@@ -10,19 +10,22 @@ class Files extends Field
     protected $_adminType = 'dropzone_media';
     protected $_databaseType = 'text';
     protected $_collection = null;
-    protected $_thumbCollection = null;
+    protected $_thumbCollection = 'backpack_thumb';
 
     public function getDefaultAttributes()
     {
-        $collection = $this->_collection;
-        if (null === $collection) {
-            $collection = $this->getAttribute('name');
-        }
-        $thumbCollection = $this->_thumbCollection;
-        if (null === $thumbCollection) {
-            $thumbCollection = $collection . '_thumbs';
-        }
 
-        return array_merge(parent::getDefaultAttributes(), ['mime_types' => $this->_mimeTypes, 'collection' => $collection, 'thumb_collection' => $thumbCollection]);
+        return array_merge(parent::getDefaultAttributes(), [
+            'form' => 'update',
+            'mime_types' => $this->_mimeTypes,
+            'collection' => $this->_collection,
+            'thumb_collection' => $this->_thumbCollection,
+            'options' => ['thumbnailHeight' => 368, 'thumbnailWidth' => 232, 'maxFilesize' => 1024, 'addRemoveLinks' => true, 'createImageThumbnails' => true]]);
+    }
+
+    protected function _postSetAttributes()
+    {
+        parent::_postSetAttributes();
+        $this->setAttributeIfNotSet('collection', $this->getAttribute('name'));
     }
 }

diff --git a/src/app/Magic/Models/CubistMagicAbstractModel.php b/src/app/Magic/Models/CubistMagicAbstractModel.php
index 3def26da971dbe6d8e413b7f680e9bc49ccd4eef..14bd0bbfa2b6edcfd53a8045a739afd511b39ae9 100644 (file)
--- a/src/app/Magic/Models/CubistMagicAbstractModel.php
+++ b/src/app/Magic/Models/CubistMagicAbstractModel.php
@@ -15,6 +15,7 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Str;
 use Spatie\MediaLibrary\HasMedia\HasMedia;
 use Spatie\MediaLibrary\HasMedia\HasMediaTrait;
+use Spatie\MediaLibrary\Models\Media;
 use Venturecraft\Revisionable\RevisionableTrait;
 
 class CubistMagicAbstractModel extends Model implements HasMedia
@@ -433,4 +434,13 @@ class CubistMagicAbstractModel extends Model implements HasMedia
         }
         return $type;
     }
+
+    public function registerMediaConversions(Media $media = null)
+    {
+        $this->addMediaConversion('backpack_thumb')
+            ->width(368)
+            ->height(232)
+            ->sharpen(10)
+            ->optimize();
+    }
 }