diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merged branch bschussek/button-fix (PR #7800)

Browse Source 
This PR was merged into the master branch.

Discussion
----------

[Form] Fixed missing label in button

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | -
| License       | MIT
| Doc PR        | -

Commits
-------

6671b32 [Form] Fixed missing label in button
This commit is contained in:
Fabien Potencier 2013-04-22 16:23:52 +02:00
commit b13af94e01
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/button_widget.html.php
View File

@ -1,4 +1,2 @@
<?php if (!$label) { $label = $view['form']->humanize($name); } ?>
<button type="<?php echo isset($type) ? $view->escape($type) : 'button' ?>" <?php echo $view['form']->block($form, 'button_attributes') ?>>
<?php $view->escape($view['translator']->trans($label, array(), $translation_domain)) ?>
</button>
<button type="<?php echo isset($type) ? $view->escape($type) : 'button' ?>" <?php echo $view['form']->block($form, 'button_attributes') ?>><?php echo $view->escape($view['translator']->trans($label, array(), $translation_domain)) ?></button>

2
src/Symfony/Component/Form/Tests/AbstractLayoutTest.php
View File

@ -1769,7 +1769,7 @@ abstract class AbstractLayoutTest extends \Symfony\Component\Form\Test\FormInteg
$form = $this->factory->createNamed('name', 'button');
$this->assertWidgetMatchesXpath($form->createView(), array(),
'/button[@type="button"][@name="name"]'
'/button[@type="button"][@name="name"][.="[trans]Name[/trans]"]'
);
}