8000 [Form] Fixed collapsed ChoiceType options attributes by HeahDude · Pull Request #19904 · symfony/symfony · GitHub
[go: up one dir, main page]
Skip to content

[Form] Fixed collapsed ChoiceType options attributes #19904

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 14, 2016
Merged

[Form] Fixed collapsed ChoiceType options attributes #19904

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Fixed collapsed ChoiceType options attributes
  • Loading branch information
@HeahDude
HeahDude committed Sep 10, 2016
commit 7806e2a05da3228480b34b2aa867b36235f0c9e3
1 change: 0 additions & 1 deletion src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/choice_attributes.html.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
id="<?php echo $view->escape($id) ?>" name="<?php echo $view->escape($full_name) ?>"
<?php if ($disabled): ?>disabled="disabled" <?php endif ?>
<?php foreach ($choice_attr as $k => $v): ?>
<?php if ($v === true): ?>
Expand Down
4 changes: 2 additions & 2 deletions src/Symfony/Component/Form/Tests/AbstractLayoutTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -612,8 +612,8 @@ public function testSingleChoiceAttributesWithMainAttributes()
[@class="bar&baz"]
[not(@required)]
[
./option[@value="&a"][@selected="selected"][.="[trans]Choice&A[/trans]"]
/following-sibling::option[@value="&b"][not(@class)][not(@selected)][.="[trans]Choice&B[/trans]"]
./option[@value="&a"][@selected="selected"][.="[trans]Choice&A[/trans]"][not(@id)][not(@name)]
/following-sibling::option[@value="&b"][not(@class)][not(@selected)][.="[trans]Choice&B[/trans]"][not(@id)][not(@name)]
]
[count(./option)=2]
'
Expand Down
0