From 8bcf0af1d4ffe58e593802fa6952513a058aeec6 Mon Sep 17 00:00:00 2001 From: Vincent Vanwaelscappel Date: Thu, 21 Jul 2022 14:15:45 +0200 Subject: [PATCH] wait #5368 @0.5 --- src/app/Magic/Models/CubistMagicTranslatableModel.php | 2 -- src/app/Magic/Models/Translate.php | 6 +++--- src/app/Magic/Operations/UpdateOperation.php | 6 +++--- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/app/Magic/Models/CubistMagicTranslatableModel.php b/src/app/Magic/Models/CubistMagicTranslatableModel.php index 6dbcee9..4fc8dc3 100644 --- a/src/app/Magic/Models/CubistMagicTranslatableModel.php +++ b/src/app/Magic/Models/CubistMagicTranslatableModel.php @@ -6,8 +6,6 @@ namespace Cubist\Backpack\Magic\Models; use Backpack\CRUD\app\Models\Traits\SpatieTranslatable\HasTranslations; use Backpack\CRUD\app\Models\Traits\SpatieTranslatable\Sluggable; use Backpack\CRUD\app\Models\Traits\SpatieTranslatable\SluggableScopeHelpers; -use Cubist\Backpack\Facades\App; -use Cubist\Backpack\Magic\Fields\Hidden; use Cubist\Util\Json; class CubistMagicTranslatableModel extends CubistMagicAbstractModel diff --git a/src/app/Magic/Models/Translate.php b/src/app/Magic/Models/Translate.php index 5b6852f..7b4810f 100644 --- a/src/app/Magic/Models/Translate.php +++ b/src/app/Magic/Models/Translate.php @@ -23,7 +23,7 @@ class Translate extends CubistMagicTranslatableModel public function getPaths() { - return ['resources/views', 'app', 'vendor/cubist/cms-back/src/app','vendor/cubist/cms-back/src/resources']; + return ['resources/views', 'app', 'vendor/cubist/cms-back/src/app', 'vendor/cubist/cms-back/src/resources']; } public function setFields() @@ -38,8 +38,8 @@ class Translate extends CubistMagicTranslatableModel $translate->parseFiles(); - $this->addField('id', Hidden::class, '', ['value' => 1]); - $this->addField('locale', Hidden::class, '', ['value' => request()->get("locale", App::getLocale())]); + $this->addField('id', Hidden::class, '', ['value' => 1, 'database_type' => 'none']); + $this->addField('locale', Hidden::class, '', ['database_type' => 'none', 'value' => request()->get("locale", App::getLocale())]); $this->addField(['name' => 'k', 'label' => '-', diff --git a/src/app/Magic/Operations/UpdateOperation.php b/src/app/Magic/Operations/UpdateOperation.php index 47cc283..43c0d0f 100644 --- a/src/app/Magic/Operations/UpdateOperation.php +++ b/src/app/Magic/Operations/UpdateOperation.php @@ -5,7 +5,7 @@ use Cubist\Backpack\Magic\Models\CubistMagicAbstractModel; trait UpdateOperation { - use \Backpack\CRUD\app\Http\Controllers\Operations\UpdateOperation{ + use \Backpack\CRUD\app\Http\Controllers\Operations\UpdateOperation { update as _update; setupUpdateDefaults as _setupUpdateDefaults; } @@ -17,8 +17,8 @@ trait UpdateOperation */ public function update() { - $res=$this->_update(); - if($this->crud->entry instanceof CubistMagicAbstractModel) { + $res = $this->_update(); + if ($this->crud->entry instanceof CubistMagicAbstractModel) { $this->crud->entry->onAfterSave(); } return $res; -- 2.39.5