wip #3753 @1

diff --git a/src/app/Magic/Fields/Datetime.php b/src/app/Magic/Fields/Datetime.php
index 23ab912db555270fd00cdb40a2ca173d598bd18b..e73c44cbf77415f13a6c83a149f870356d726c5f 100644 (file)
--- a/src/app/Magic/Fields/Datetime.php
+++ b/src/app/Magic/Fields/Datetime.php
@@ -11,6 +11,7 @@ class Datetime extends Field
     protected $_databaseType = 'datetime';
     protected $_columnType = 'datetime';
     protected $_columnFormat = 'Y-m-d, H:i';
+    protected $_filterType = 'date_range';
 
     public function _mutator($value)
     {

diff --git a/src/app/Magic/Fields/Field.php b/src/app/Magic/Fields/Field.php
index b21541cc2f44671b88db6d96a6d122c4381d05e0..ac7792266649a5ad35ae9b6cdc7825bfc29d2246 100644 (file)
--- a/src/app/Magic/Fields/Field.php
+++ b/src/app/Magic/Fields/Field.php
@@ -214,6 +214,10 @@ class Field implements \ArrayAccess
             $crud->addClause('where', $name, $value);
         } else if ($type === 'select2_multiple') {
             $crud->addClause('whereIn', $name, json_decode($value));
+        } else if ($type === 'date_range') {
+            $dates = json_decode($value);
+            $crud->addClause('where', $name, '>=', trim($dates->from));
+            $crud->addClause('where', $name, '<=', trim($dates->to));
         }
     }