#2843

diff --git a/src/app/Magic/Fields/Date.php b/src/app/Magic/Fields/Date.php
index ca59d885dda978948e518c133c233df68f3ff2e0..0ee43a3b5ba364b3cceb1043b962a9e34651b898 100644 (file)
--- a/src/app/Magic/Fields/Date.php
+++ b/src/app/Magic/Fields/Date.php
@@ -7,4 +7,5 @@ class Date extends Datetime
 {
     protected $_adminType = 'date_picker';
     protected $_databaseType = 'date';
+    protected $_cast = 'date';
 }

diff --git a/src/app/Magic/Fields/Datetime.php b/src/app/Magic/Fields/Datetime.php
index 3495d1e0fc0d30eaa1df92382ea8d51592c46297..c9743f7b2bf765a3b9e3c73da97dae77eb05934f 100644 (file)
--- a/src/app/Magic/Fields/Datetime.php
+++ b/src/app/Magic/Fields/Datetime.php
@@ -6,7 +6,7 @@ namespace Cubist\Backpack\app\Magic\Fields;
 class Datetime extends Field
 {
     protected $_adminType = 'datetime_picker';
-    protected $_cast = 'date';
+    protected $_cast = 'datetime';
     protected $pickerOptions = ['format' => 'DD/MM/YYYY HH:mm', 'language' => 'fr'];
     protected $_databaseType = 'datetime';
 

diff --git a/src/app/Magic/Models/News.php b/src/app/Magic/Models/News.php
index aeac8340aef87a78df1b91ffdf35b39d4b9b5652..e8667fca96282caaa646e7c05f3be59805ca4bfe 100644 (file)
--- a/src/app/Magic/Models/News.php
+++ b/src/app/Magic/Models/News.php
@@ -26,15 +26,42 @@ class News extends CubistMagicModel
             'type' => 'Slug',
             'label' => 'Slug (URL)']);
 
+        $this->addField(['name' => 'type',
+            'type' => 'SelectFromArray',
+            'label' => 'Type',
+            'options' => ['news' => 'Actualité', 'event' => 'Evénement'],
+            'column' => true,
+        ]);
+
         $this->addField(['name' => 'date',
             'type' => 'Datetime',
             'label' => 'Date de publication',
             'column' => true]);
 
+        $this->addField(['name' => 'event_start',
+            'type' => 'Date',
+            'label' => 'Début de l\'évenement',
+            'when' => ['type' => ['event']],
+        ]);
+
+        $this->addField(['name' => 'event_end',
+            'type' => 'Date',
+            'label' => 'Fin de l\'évenement',
+            'when' => ['type' => ['event']],
+        ]);
+
+        $this->addField(['name' => 'event_place',
+            'type' => 'Text',
+            'label' => 'Lieu de l\'événement',
+            'when' => ['type' => ['event']],
+        ]);
+
         $this->addField(['name' => 'chapo',
             'type' => 'Textarea',
             'label' => 'Chapo',
-            'hint' => 'Texte court affiché sur le listing des actualités']);
+            'hint' => 'Texte court affiché sur le listing des actualités',
+            'when' => ['type' => ['news']]
+        ]);
 
         $this->addField(['name' => 'image',
             'type' => 'Images',
@@ -47,7 +74,7 @@ class News extends CubistMagicModel
 
         $this->addField(['name' => 'status',
             'type' => 'SelectFromArray',
-            'label'=>'Status',
+            'label' => 'Status',
             'options' => ['0' => 'Offline', '1' => 'Published'],
             'column' => true
         ]);