Merge pull request #436 from sol1/ss4-alpha6-fixes

ss4 alpha6 fixes
This commit is contained in:
Daniel Hensby 2017-04-18 16:02:38 +01:00 committed by GitHub
commit 81c8e6b939
3 changed files with 3 additions and 3 deletions

View File

@ -12,7 +12,7 @@ use SilverStripe\Forms\Tab;
use SilverStripe\Lumberjack\Model\Lumberjack; use SilverStripe\Lumberjack\Model\Lumberjack;
use SilverStripe\ORM\DataObject; use SilverStripe\ORM\DataObject;
use SilverStripe\ORM\FieldType\DBDatetime; use SilverStripe\ORM\FieldType\DBDatetime;
use SilverStripe\ORM\Versioning\Versioned; use SilverStripe\Versioned\Versioned;
use SilverStripe\Security\Permission; use SilverStripe\Security\Permission;
/** /**

View File

@ -266,7 +266,7 @@ class BlogPost extends Page
} }
$publishDate = DatetimeField::create('PublishDate', _t('BlogPost.PublishDate', 'Publish Date')); $publishDate = DatetimeField::create('PublishDate', _t('BlogPost.PublishDate', 'Publish Date'));
$publishDate->getDateField()->setShowCalendar(true);
if (!$this->PublishDate) { if (!$this->PublishDate) {
$publishDate->setDescription( $publishDate->setDescription(
_t( _t(

View File

@ -10,7 +10,7 @@ use SilverStripe\ORM\DataObject;
use SilverStripe\ORM\DataQuery; use SilverStripe\ORM\DataQuery;
use SilverStripe\ORM\FieldType\DBDatetime; use SilverStripe\ORM\FieldType\DBDatetime;
use SilverStripe\ORM\Queries\SQLSelect; use SilverStripe\ORM\Queries\SQLSelect;
use SilverStripe\ORM\Versioning\Versioned; use SilverStripe\Versioned\Versioned;
use SilverStripe\Security\Permission; use SilverStripe\Security\Permission;
/** /**