tonyair
/
silverstripe-testsession
mirror of https://github.com/silverstripe/silverstripe-testsession
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #8 from mateusz/php53 

Fix syntax to work with php 5.3, in line with required dependency.
This commit is contained in:
Ingo Schommer 2014-02-07 11:41:13 +13:00
parent 20efb0c6fa bb289936cf
commit 1f67061901
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
code/TestSessionController.php
View File

@ -67,10 +67,11 @@ class TestSessionController extends Controller {
); );
if($databaseTemplates) { if($databaseTemplates) {
$fields->push( $fields->push(
(new DropdownField('createDatabaseTemplate', false)) $dropdown = new DropdownField('createDatabaseTemplate', false)
->setSource($databaseTemplates)
->setEmptyString('Empty database')
); );
$dropdown->setSource($databaseTemplates)
->setEmptyString('Empty database');
} }
$fields->merge($this->getBaseFields()); $fields->merge($this->getBaseFields());
$form = new Form( $form = new Form(
@ -111,11 +112,11 @@ class TestSessionController extends Controller {
protected function getBaseFields() { protected function getBaseFields() {
$fields = new FieldList( $fields = new FieldList(
(new TextField('fixture', 'Fixture YAML file path')) $textfield = new TextField('fixture', 'Fixture YAML file path'),
->setAttribute('placeholder', 'Example: framework/tests/security/MemberTest.yml'),
$datetimeField = new DatetimeField('datetime', 'Custom date'), $datetimeField = new DatetimeField('datetime', 'Custom date'),
new HiddenField('flush', null, 1) new HiddenField('flush', null, 1)
); );
$textfield->setAttribute('placeholder', 'Example: framework/tests/security/MemberTest.yml');
$datetimeField->getDateField() $datetimeField->getDateField()
->setConfig('dateformat', 'yyyy-MM-dd') ->setConfig('dateformat', 'yyyy-MM-dd')
->setConfig('showcalendar', true) ->setConfig('showcalendar', true)
@ -390,4 +391,4 @@ class TestSessionController extends Controller {
return $templates; return $templates;
} }
} }