wait #5368 @0.5

diff --git a/src/app/Magic/Models/CubistMagicTranslatableModel.php b/src/app/Magic/Models/CubistMagicTranslatableModel.php
index 6dbcee91a8c78dc20f6b4f2c073f41b3d1eb581b..4fc8dc36cbf43b6b0988968259a2b8c8b082cb55 100644 (file)
--- 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 5b6852f4bfca8f7cd01b0550679f10598fcba141..7b4810fc579968d82c690aaec63b7326355b8b98 100644 (file)
--- 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 47cc283e341deeaac8330e890064a38142658e34..43c0d0ff624a25282d5a1e2e6e654a55075ea8f3 100644 (file)
--- 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;