Merge branch '3.1'

This commit is contained in:
Robbie Averill 2018-04-10 15:53:48 +12:00
commit c83232bd6e
2 changed files with 1 additions and 10 deletions

View File

@ -15,7 +15,7 @@
"silverstripe/asset-admin": "^1.0" "silverstripe/asset-admin": "^1.0"
}, },
"require-dev": { "require-dev": {
"phpunit/PHPUnit": "^5.7", "phpunit/phpunit": "^5.7",
"squizlabs/php_codesniffer": "^3.0" "squizlabs/php_codesniffer": "^3.0"
}, },
"extra": { "extra": {

View File

@ -248,14 +248,6 @@ class BlogPost extends Page
$fields->insertAfter('FeaturedImage', $summaryHolder); $fields->insertAfter('FeaturedImage', $summaryHolder);
$urlSegment = $fields->dataFieldByName('URLSegment');
$urlSegment->setURLPrefix($this->Parent()->RelativeLink());
$fields->removeFieldsFromTab('Root.Main', [
'MenuTitle',
'URLSegment',
]);
$authorField = ListboxField::create( $authorField = ListboxField::create(
'Authors', 'Authors',
_t(__CLASS__ . '.Authors', 'Authors'), _t(__CLASS__ . '.Authors', 'Authors'),
@ -306,7 +298,6 @@ class BlogPost extends Page
'Root.PostOptions', 'Root.PostOptions',
[ [
$publishDate, $publishDate,
$urlSegment,
TagField::create( TagField::create(
'Categories', 'Categories',
_t(__CLASS__ . '.Categories', 'Categories'), _t(__CLASS__ . '.Categories', 'Categories'),