wip #4211 @0.5

diff --git a/src/app/Magic/Fields/Date.php b/src/app/Magic/Fields/Date.php
index 537147bd9da326b63a0d41386e13ab66a2827515..f6f986c8af2d9c3da065c945583dca0b3e24570f 100644 (file)
--- a/src/app/Magic/Fields/Date.php
+++ b/src/app/Magic/Fields/Date.php
@@ -9,5 +9,5 @@ class Date extends Datetime
     protected $_databaseType = 'date';
     protected $_cast = 'date';
     protected $_columnType = 'date';
-    protected $_columnFormat = 'Y-m-d, H:i';
+    protected $_columnFormat = 'YYYY-MM-DD';
 }

diff --git a/src/app/Magic/Fields/Datetime.php b/src/app/Magic/Fields/Datetime.php
index e73c44cbf77415f13a6c83a149f870356d726c5f..62aa6a01301b0b07646036435618d847943357db 100644 (file)
--- a/src/app/Magic/Fields/Datetime.php
+++ b/src/app/Magic/Fields/Datetime.php
@@ -10,7 +10,7 @@ class Datetime extends Field
     protected $pickerOptions = ['format' => 'DD/MM/YYYY HH:mm', 'language' => 'fr'];
     protected $_databaseType = 'datetime';
     protected $_columnType = 'datetime';
-    protected $_columnFormat = 'Y-m-d, H:i';
+    protected $_columnFormat = 'YYYY-MM-DD HH:mm';
     protected $_filterType = 'date_range';
 
     public function _mutator($value)

diff --git a/src/app/Magic/Models/CubistMagicAbstractModel.php b/src/app/Magic/Models/CubistMagicAbstractModel.php
index 5f32a8804a9fd039c442c6c5b51a41fc48d306ca..9be0538edf00fc84517d8a41da6c812366115b52 100644 (file)
--- a/src/app/Magic/Models/CubistMagicAbstractModel.php
+++ b/src/app/Magic/Models/CubistMagicAbstractModel.php
@@ -5,6 +5,7 @@ namespace Cubist\Backpack\Magic\Models;
 use Backpack\CRUD\app\Http\Controllers\Operations\BulkCloneOperation;
 use Backpack\CRUD\app\Http\Controllers\Operations\BulkDeleteOperation;
 use Backpack\CRUD\app\Http\Controllers\Operations\CloneOperation;
+use Cubist\Backpack\Magic\Fields\Datetime;
 use Cubist\Backpack\Magic\Fields\Files;
 use Cubist\Backpack\Magic\Operations\CreateOperation;
 use Backpack\CRUD\app\Http\Controllers\Operations\DeleteOperation;
@@ -217,6 +218,16 @@ class CubistMagicAbstractModel extends Model implements HasMedia
                 'fillable' => true]
         );
 
+        if ($this->timestamps) {
+            $timestamps = [self::UPDATED_AT, self::CREATED_AT, 'deleted_at'];
+            foreach ($timestamps as $timestamp) {
+                if ($this->hasField($timestamp)) {
+                    continue;
+                }
+                $this->addField($timestamp, Datetime::class, '', ['hidden' => true]);
+            }
+        }
+
         $this->fakeColumns = array_unique($this->fakeColumns);
         if (get_class($this) !== config("auth.providers.users.model")) {
             foreach ($this->_fields as $name => $field) {
@@ -508,10 +519,6 @@ class CubistMagicAbstractModel extends Model implements HasMedia
             $table->addColumn($fakeColumn, 'text', ['notnull' => false]);
         }
 
-        if ($this->timestamps) {
-            $this->_addTimestampsDatabaseColumns($table);
-        }
-
         return $table;
     }