From: Vincent Vanwaelscappel Date: Wed, 29 May 2019 17:13:25 +0000 (+0200) Subject: #2783 X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=6f7f96ddce3891a1e9c8ef78c64d142373192d6b;p=cubist_cms-back.git #2783 --- diff --git a/composer.json b/composer.json index 8d0db48..40fbd72 100644 --- a/composer.json +++ b/composer.json @@ -33,7 +33,8 @@ "fideloper/proxy": "^4.0", "predis/predis": "^1.1", "webfactor/laravel-backpack-instant-fields": "^2.3.1", - "webfactor/laravel-backpack-nestedmodels": "^1.0.1@dev" + "webfactor/laravel-backpack-nestedmodels": "^1.0.1@dev", + "spatie/laravel-translatable": "^4.1" }, "require-dev": { "filp/whoops": "^2.3", diff --git a/src/app/Magic/Fields/Field.php b/src/app/Magic/Fields/Field.php index 7c67f49..7e8063b 100644 --- a/src/app/Magic/Fields/Field.php +++ b/src/app/Magic/Fields/Field.php @@ -18,6 +18,7 @@ class Field protected $_databaseType = 'text'; protected $_databaseUnique = false; protected $_databaseIndex = false; + protected $_translatable = true; protected $_databaseAttributes = []; /** @@ -53,7 +54,7 @@ class Field public function getDefaultAttributes() { return ['type' => $this->_adminType, 'column' => false, 'form' => 'both', 'rules' => '', - 'fillable' => true, 'guarded' => false, 'hidden' => false]; + 'fillable' => true, 'guarded' => false, 'hidden' => false, 'translatable' => $this->_translatable]; } public function __construct($attributes) diff --git a/src/app/Magic/Fields/Markdown.php b/src/app/Magic/Fields/Markdown.php index 336d381..8c7837b 100644 --- a/src/app/Magic/Fields/Markdown.php +++ b/src/app/Magic/Fields/Markdown.php @@ -8,4 +8,5 @@ class Markdown extends Field { protected $_adminType = 'simplemde'; protected $_databaseType = 'text'; + protected $_translatable = true; } diff --git a/src/app/Magic/Fields/Slug.php b/src/app/Magic/Fields/Slug.php index 21730e5..806fcb8 100644 --- a/src/app/Magic/Fields/Slug.php +++ b/src/app/Magic/Fields/Slug.php @@ -5,4 +5,5 @@ namespace Cubist\Backpack\app\Magic\Fields; class Slug extends Field { protected $_databaseType = 'string'; + protected $_translatable = true; } diff --git a/src/app/Magic/Fields/Table.php b/src/app/Magic/Fields/Table.php index 350ed66..11bff60 100644 --- a/src/app/Magic/Fields/Table.php +++ b/src/app/Magic/Fields/Table.php @@ -8,5 +8,6 @@ class Table extends Field { protected $_adminType = 'table'; protected $_databaseType = 'text'; + protected $_translatable = true; } diff --git a/src/app/Magic/Fields/Text.php b/src/app/Magic/Fields/Text.php index 711773a..3cc2e35 100644 --- a/src/app/Magic/Fields/Text.php +++ b/src/app/Magic/Fields/Text.php @@ -5,4 +5,5 @@ namespace Cubist\Backpack\app\Magic\Fields; class Text extends Field { protected $_databaseType = 'string'; + protected $_translatable = true; } diff --git a/src/app/Magic/Fields/Textarea.php b/src/app/Magic/Fields/Textarea.php index a4b36af..0978b1f 100644 --- a/src/app/Magic/Fields/Textarea.php +++ b/src/app/Magic/Fields/Textarea.php @@ -8,4 +8,5 @@ class Textarea extends Field { protected $_adminType = 'textarea'; protected $_databaseType = 'text'; + protected $_translatable = true; } diff --git a/src/app/Magic/Models/CubistMagicAbstractModel.php b/src/app/Magic/Models/CubistMagicAbstractModel.php index 0480281..bf250cc 100644 --- a/src/app/Magic/Models/CubistMagicAbstractModel.php +++ b/src/app/Magic/Models/CubistMagicAbstractModel.php @@ -6,8 +6,9 @@ namespace Cubist\Backpack\app\Magic\Models; use Backpack\CRUD\CrudTrait; use Cubist\Backpack\app\Magic\Fields\Field; use Cubist\Backpack\app\Magic\Util; -use Cviebrock\EloquentSluggable\Sluggable; -use Cviebrock\EloquentSluggable\SluggableScopeHelpers; +use Backpack\CRUD\ModelTraits\SpatieTranslatable\Sluggable; +use Backpack\CRUD\ModelTraits\SpatieTranslatable\SluggableScopeHelpers; +use Backpack\CRUD\ModelTraits\SpatieTranslatable\HasTranslations; use Doctrine\DBAL\Schema\Schema; use Illuminate\Database\Eloquent\Model; use Illuminate\Support\Str; @@ -19,6 +20,8 @@ class CubistMagicAbstractModel extends Model use Sluggable { replicate as protected replicateSluggable; } + use Sluggable, SluggableScopeHelpers; + use HasTranslations; protected static $_doctrineTypesMapping = ['int' => 'integer'];