From 902151603cc985f9d99980198b054e30261695ed Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Wed, 26 Apr 2017 10:31:22 +1200 Subject: [PATCH 1/3] Removed unused DMYDate --- code/BasicFieldsTestPage.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/code/BasicFieldsTestPage.php b/code/BasicFieldsTestPage.php index 6312268..e60055f 100644 --- a/code/BasicFieldsTestPage.php +++ b/code/BasicFieldsTestPage.php @@ -29,7 +29,6 @@ class BasicFieldsTestPage extends TestPage 'DateTime' => 'Datetime', 'DateTimeWithCalendar' => 'Datetime', 'DBFile' => 'DBFile', - 'DMYDate' => 'Date', 'Email' => 'Varchar', 'HTMLField' => 'HTMLText', 'Money' => 'Money', @@ -123,7 +122,6 @@ class BasicFieldsTestPage extends TestPage 'Date' => "2002-10-23", 'DateTime' => "2002-10-23 23:59", 'DateTimeWithCalendar' => "2002-10-23 23:59", - 'DMYDate' => "2002-10-23", 'DropdownID' => $firstCat->ID, 'Email' => 'test@test.com', 'GroupedDropdownID' => $firstCat->ID, @@ -271,7 +269,7 @@ class BasicFieldsTestPage extends TestPage )); $blacklist = array( - 'DMYDate', 'Required', 'Validated', 'ToggleCompositeField', 'SelectionGroup' + 'Required', 'Validated', 'ToggleCompositeField', 'SelectionGroup' ); $tabs = array('Root.Text', 'Root.Numeric', 'Root.Option', 'Root.DateTime', 'Root.File'); From 8cb15a45deea69a9331e98b0499419329d04a185 Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Wed, 26 Apr 2017 10:32:02 +1200 Subject: [PATCH 2/3] Align date minimums with db defaults Avoid validation errors by default --- code/BasicFieldsTestPage.php | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/code/BasicFieldsTestPage.php b/code/BasicFieldsTestPage.php index e60055f..3318a7a 100644 --- a/code/BasicFieldsTestPage.php +++ b/code/BasicFieldsTestPage.php @@ -114,14 +114,14 @@ class BasicFieldsTestPage extends TestPage $thirdCat = $cats->offsetGet(2); return array( - 'CalendarDate' => "2002-10-23", + 'CalendarDate' => "2017-01-31", 'Checkbox' => 1, // 'CheckboxSet' => null, 'ConfirmedPassword' => 'secret', 'CreditCard' => '4000400040004111', - 'Date' => "2002-10-23", - 'DateTime' => "2002-10-23 23:59", - 'DateTimeWithCalendar' => "2002-10-23 23:59", + 'Date' => "2017-01-31", + 'DateTime' => "2017-01-31 23:59", + 'DateTimeWithCalendar' => "2017-01-31 23:59", 'DropdownID' => $firstCat->ID, 'Email' => 'test@test.com', 'GroupedDropdownID' => $firstCat->ID, @@ -231,13 +231,14 @@ class BasicFieldsTestPage extends TestPage )) )); - // All these date/time fields generally have issues saving directly in the CMS - $minDate = date('Y-m-d', strtotime('-7 days')); + $minDate = '2017-01-01'; + $minDateTime = '2017-01-01 23:59:00'; $fields->addFieldsToTab('Root.DateTime', array( Object::create('SilverStripe\\Forms\\DateField', 'CalendarDate', 'DateField with HTML5 (min date: ' . $minDate . ')') ->setMinDate($minDate), - Object::create('SilverStripe\\Forms\\DateField', 'Date', 'DateField without HTML5') - ->setHTML5(false), + Object::create('SilverStripe\\Forms\\DateField', 'Date', 'DateField without HTML5 (min date: ' . $minDate . ')') + ->setHTML5(false) + ->setMinDate($minDate), Object::create('SilverStripe\\Forms\\TimeField', 'Time', 'TimeField without HTML5') ->setHTML5(false), Object::create('SilverStripe\\Forms\\TimeField', 'TimeHTML5', 'TimeField with HTML5'), From 0e893b503bd7512146f1f8517b3792ae144f8fa0 Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Wed, 26 Apr 2017 10:32:09 +1200 Subject: [PATCH 3/3] Support for new DatetimeField See https://github.com/silverstripe/silverstripe-framework/issues/6140 --- code/BasicFieldsTestPage.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/code/BasicFieldsTestPage.php b/code/BasicFieldsTestPage.php index 3318a7a..f225cab 100644 --- a/code/BasicFieldsTestPage.php +++ b/code/BasicFieldsTestPage.php @@ -242,12 +242,12 @@ class BasicFieldsTestPage extends TestPage Object::create('SilverStripe\\Forms\\TimeField', 'Time', 'TimeField without HTML5') ->setHTML5(false), Object::create('SilverStripe\\Forms\\TimeField', 'TimeHTML5', 'TimeField with HTML5'), - $dateTime = Object::create('SilverStripe\\Forms\\DatetimeField', 'DateTime', 'DateTime without HTML5'), - $dateTimeShowCalendar = Object::create('SilverStripe\\Forms\\DatetimeField', 'DateTimeWithCalendar', 'DateTime with HTML5') + Object::create('SilverStripe\\Forms\\DatetimeField', 'DateTime', 'DateTime without HTML5 (min date/time: ' . $minDateTime . ')') + ->setHTML5(false) + ->setMinDatetime($minDateTime), + Object::create('SilverStripe\\Forms\\DatetimeField', 'DateTimeWithCalendar', 'DateTime with HTML5 (min date/time: ' . $minDateTime . ')') + ->setMinDatetime($minDateTime), )); - $dateTime->getDateField()->setHTML5(true); - $dateTime->getTimeField()->setHTML5(true); - $dateTimeShowCalendar->setRightTitle('Right title'); $fields->addFieldsToTab('Root.File', array( $bla = UploadField::create('File', 'UploadField with multiUpload=false')