From db7c5376668b7750f774eac525b460e5df9b9787 Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Sun, 15 Jan 2017 21:19:56 +1300 Subject: [PATCH] Use PageController without underscore --- code/GridFieldTestPage.php | 14 +++++++------- code/TestPage.php | 11 ++--------- code/multiform/Page2MultiFormTestPage.php | 4 ++-- code/multiform/Page3MultiFormTestPage.php | 4 ++-- code/multiform/TestMultiFormPage.php | 10 +++++----- code/recaptcha/RecaptchaTestPage.php | 12 ++++++------ code/sifr/SifrPage.php | 12 ++++++------ code/tagfield/TestTagFieldPage.php | 2 +- 8 files changed, 31 insertions(+), 38 deletions(-) diff --git a/code/GridFieldTestPage.php b/code/GridFieldTestPage.php index b59903a..b981a68 100644 --- a/code/GridFieldTestPage.php +++ b/code/GridFieldTestPage.php @@ -23,7 +23,7 @@ class GridFieldTestPage extends TestPage private static $many_many = array( "ManyManyCompanies" => "SilverStripe\\FrameworkTest\\Model\\Company", ); - + public function getCMSFields() { $fields = parent::getCMSFields(); @@ -55,33 +55,33 @@ class GridFieldTestPage extends TestPage } } -class GridFieldTestPage_Controller extends Page_Controller +class GridFieldTestPage_Controller extends PageController { private static $allowed_actions = array( 'Form', ); - + /** * * @var string */ public $Title = "GridFieldTestPage"; - + public function init() { parent::init(); Requirements::css('frameworktest/css/gridfieldtest.css', 'screen'); } - + /** * - * @return Form + * @return Form */ public function Form() { $config = new GridFieldConfig_RecordEditor(); - + $grid = new GridField('Companies', 'Companies', new DataList('SilverStripe\\FrameworkTest\\Model\\Company'), $config); return new Form($this, 'Form', new FieldList($grid), new FieldList()); } diff --git a/code/TestPage.php b/code/TestPage.php index 239cea6..136266f 100644 --- a/code/TestPage.php +++ b/code/TestPage.php @@ -3,14 +3,7 @@ namespace SilverStripe\FrameworkTest\Model; use Page; - - -use Page_Controller; - - - - - +use PageController; use SilverStripe\ORM\DataObject; use SilverStripe\CMS\Model\SiteTree; use SilverStripe\Forms\FormAction; @@ -77,7 +70,7 @@ class TestPage extends Page /** * Parent class of all test page controllers */ -class TestPage_Controller extends Page_Controller +class TestPage_Controller extends PageController { private static $allowed_actions = array( 'Form', diff --git a/code/multiform/Page2MultiFormTestPage.php b/code/multiform/Page2MultiFormTestPage.php index 1c752ae..b72647a 100644 --- a/code/multiform/Page2MultiFormTestPage.php +++ b/code/multiform/Page2MultiFormTestPage.php @@ -4,9 +4,9 @@ class Page2MultiFormTestPage extends Page { } -class Page2MultiFormTestPage_Controller extends Page_Controller +class Page2MultiFormTestPage_Controller extends PageController { - + public function Page2MultiForm() { return new Page2MultiForm($this, 'Page2MultiForm'); diff --git a/code/multiform/Page3MultiFormTestPage.php b/code/multiform/Page3MultiFormTestPage.php index b8ef35c..8f7161d 100644 --- a/code/multiform/Page3MultiFormTestPage.php +++ b/code/multiform/Page3MultiFormTestPage.php @@ -4,9 +4,9 @@ class Page3MultiFormTestPage extends Page { } -class Page3MultiFormTestPage_Controller extends Page_Controller +class Page3MultiFormTestPage_Controller extends PageController { - + public function Page3MultiForm() { return new Page3MultiForm($this, 'Page3MultiForm'); diff --git a/code/multiform/TestMultiFormPage.php b/code/multiform/TestMultiFormPage.php index aea3d08..776fb02 100644 --- a/code/multiform/TestMultiFormPage.php +++ b/code/multiform/TestMultiFormPage.php @@ -3,25 +3,25 @@ class TestMultiFormPage extends Page { } -class TestMultiFormPage_Controller extends Page_Controller +class TestMultiFormPage_Controller extends PageController { - + public function Form() { $form = new TestMultiForm($this, 'Form', new FieldList(), new FieldList()); return $form; } - + public function FormMessage() { if (Session::get('MultiFormMessage')) { $message = Session::get('MultiFormMessage'); Session::clear('MultiFormMessage'); - + return $message; } - + return false; } } diff --git a/code/recaptcha/RecaptchaTestPage.php b/code/recaptcha/RecaptchaTestPage.php index a3003b4..ed5656c 100644 --- a/code/recaptcha/RecaptchaTestPage.php +++ b/code/recaptcha/RecaptchaTestPage.php @@ -11,9 +11,9 @@ class RecaptchaTestPage extends Page { } -class RecaptchaTestPage_Controller extends Page_Controller +class RecaptchaTestPage_Controller extends PageController { - + public function Form() { $fields = new FieldList( @@ -24,7 +24,7 @@ class RecaptchaTestPage_Controller extends Page_Controller } else { $fields->push(new LiteralField('

RecaptchaField class not found

')); } - + $form = new Form( $this, 'Form', @@ -34,14 +34,14 @@ class RecaptchaTestPage_Controller extends Page_Controller ), new RequiredFields(array('MyText')) ); - + return $form; } - + public function submit($data, $form) { $form->sessionMessage('Hooray!', 'good'); - + return Director::redirectBack(); } } diff --git a/code/sifr/SifrPage.php b/code/sifr/SifrPage.php index c20403f..91c7d7a 100644 --- a/code/sifr/SifrPage.php +++ b/code/sifr/SifrPage.php @@ -1,25 +1,25 @@ -addFieldToTab("Root.Content.SifrSampleImage", new LiteralField("SifrSampleImage", '

')); - + return $fields; } } -class SifrPage_Controller extends Page_Controller +class SifrPage_Controller extends PageController { - + public function init() { parent::init(); - + Sifr::add_font('blackout', 'themes/fonts/blackout.swf'); Sifr::replace_element('blackout', 'h2', "'.sIFR-root { text-align: left; color: red;'"); Sifr::replace_element('blackout', 'h3', "'.sIFR-root { text-align: left; color: red;'"); diff --git a/code/tagfield/TestTagFieldPage.php b/code/tagfield/TestTagFieldPage.php index b01f1e7..5a9bb94 100644 --- a/code/tagfield/TestTagFieldPage.php +++ b/code/tagfield/TestTagFieldPage.php @@ -37,4 +37,4 @@ // } -// class TestTagFieldPage_Controller extends Page_Controller {} +// class TestTagFieldPage_Controller extends PageController {}