wip #4627 @1

diff --git a/src/app/Magic/Models/CubistMagicAbstractModel.php b/src/app/Magic/Models/CubistMagicAbstractModel.php
index a39f8edefe6775c86c53fa1e4b6b986f3a5c11d4..5f32a8804a9fd039c442c6c5b51a41fc48d306ca 100644 (file)
--- a/src/app/Magic/Models/CubistMagicAbstractModel.php
+++ b/src/app/Magic/Models/CubistMagicAbstractModel.php
@@ -202,7 +202,8 @@ class CubistMagicAbstractModel extends Model implements HasMedia
                 'label' => 'Slug',
                 'translatable' => true,
                 'hidden' => true,
-                'fillable' => false]);
+                'fillable' => false,
+                'database_type' => 'string']);
         }
         $this->addField(
             ['name' => 'created_ok',
@@ -439,7 +440,7 @@ class CubistMagicAbstractModel extends Model implements HasMedia
             if (!$str) {
                 continue;
             }
-            $translate .= "\t_"."_('" . addcslashes($str, "'") . "')\n";
+            $translate .= "\t_" . "_('" . addcslashes($str, "'") . "')\n";
         }
         $translate .= "\t*/";
 

diff --git a/src/app/Magic/Models/Translate.php b/src/app/Magic/Models/Translate.php
index 26b5fef3f069b44703c2d696f5d6a17d20360311..a6a5c0413d82b8fcf960cc2ab1fcaa8935dade81 100644 (file)
--- a/src/app/Magic/Models/Translate.php
+++ b/src/app/Magic/Models/Translate.php
@@ -86,10 +86,10 @@ class Translate extends CubistMagicTranslatableModel
     }
 
 
-    public function postSave()
+    public function onAfterSave()
     {
         $this->saveLanguageFile();
-        parent::postSave();
+        parent::onAfterSave();
     }
 
 

diff --git a/src/resources/views/form/shortcuts.blade.php b/src/resources/views/form/shortcuts.blade.php
index 2d8d5327c6159b4864a3c9f83d605b6c835da231..6f03ce9706a7c6d21115481ac5b95d2ab3f9ab7e 100644 (file)
--- a/src/resources/views/form/shortcuts.blade.php
+++ b/src/resources/views/form/shortcuts.blade.php
@@ -37,7 +37,7 @@
                             $("#saveActions").insertBefore('#form_shortcuts');
 
                             $("#saveActions [type=\"submit\"]").on('click', function () {
-                                $(this).closest('main').find('form').submit();
+                                $(this).closest('main').find('form').eq(0).submit();
                                 return false;
                             });
                         });