tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-06-28 15:39:40 +02:00
Code Issues Projects Releases Wiki Activity

BUGFIX: Fix correct input type for ImageFormAction replaces.

Browse Source 
ImageFormAction is deprecated, using the new API results in a submit input rather than an image input being generated. Added hasAttribute helper to FormField as well as test coverage.
This commit is contained in:
Will Rossiter 2012-06-13 09:57:54 +02:00 committed by Ingo Schommer
parent ce3d48e310
commit 78c15ea882
3 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
forms/FormAction.php
View File

@ -80,12 +80,15 @@ class FormAction extends FormField {
}
function getAttributes() {
$type = (isset($this->attributes['src'])) ? 'image' : 'submit';
$type = ($this->useButtonTag) ? null : $type;
return array_merge(
parent::getAttributes(),
array(
'disabled' => ($this->isReadonly() || $this->isDisabled()),
'value' => $this->Title(),
'type' => ($this->useButtonTag) ? null : 'submit',
'type' => $type,
'title' => ($this->useButtonTag) ? $this->description : null,
)
);

2
forms/FormField.php
View File

@ -357,7 +357,7 @@ class FormField extends RequestHandler {
$attrs = $this->getAttributes();
return @$attrs[$name];
}
/**
* @return array
*/

16
tests/forms/FormActionTest.php Normal file
View File

@ -0,0 +1,16 @@
<?php
/**
* @package framework
* @subpackage tests
*/
class FormActionTest extends SapphireTest {
public function testGetField() {
$formAction = new FormAction('test');
$this->assertContains('type="submit"', $formAction->getAttributesHTML());
$formAction->setAttribute('src', 'file.png');
$this->assertContains('type="image"', $formAction->getAttributesHTML());
}
}