tonyair/silverstripe-cms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-cms synced 2024-10-22 08:05:56 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1546 from open-sausages/pulls/4.0/casting-regressions

Browse Source 
BUG Fix regressions from https://github.com/silverstripe/silverstripe-framework/pull/5653
This commit is contained in:
Hamish Friedlander 2016-07-14 15:38:32 +12:00 committed by GitHub
commit 563e942e18
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
code/controllers/CMSPageAddController.php
View File

@ -1,6 +1,7 @@
<?php
use SilverStripe\ORM\DataObject;
use SilverStripe\ORM\FieldType\DBField;
use SilverStripe\ORM\ValidationException;
use SilverStripe\Security\Member;
use SilverStripe\Security\Security;
@ -30,7 +31,7 @@ class CMSPageAddController extends CMSPageEditController {
$type->getField('AddAction'),
$type->getField('Description')
);
$pageTypes[$type->getField('ClassName')] = $html;
$pageTypes[$type->getField('ClassName')] = DBField::create_field('HTMLFragment', $html);
}
// Ensure generic page type shows on top
if(isset($pageTypes['Page'])) {
@ -68,7 +69,10 @@ class CMSPageAddController extends CMSPageEditController {
),
$typeField = new OptionsetField(
"PageType",
sprintf($numericLabelTmpl, 2, _t('CMSMain.ChoosePageType', 'Choose page type')),
DBField::create_field(
'HTMLFragment',
sprintf($numericLabelTmpl, 2, _t('CMSMain.ChoosePageType', 'Choose page type'))
),
$pageTypes,
'Page'
),
@ -84,14 +88,11 @@ class CMSPageAddController extends CMSPageEditController {
)
);
$parentField->setSearchFunction(function ($sourceObject, $labelField, $search) {
return DataObject::get(
$sourceObject,
sprintf(
"\"MenuTitle\" LIKE '%%%s%%' OR \"Title\" LIKE '%%%s%%'",
Convert::raw2sql($search),
Convert::raw2sql($search)
)
);
return DataObject::get($sourceObject)
->filterAny([
'MenuTitle:PartialMatch' => $search,
'Title:PartialMatch' => $search,
]);
});
// TODO Re-enable search once it allows for HTML title display,