Skip to content

Commit a061076

Browse files
javiereguiluzjaviereguiluz
committed
Merge branch '4.3' into 4.4
* 4.3: [Form] Added the attr_row option to all form types
2 parents f9c2567 + 4dec9d0 commit a061076

37 files changed

+246
-38
lines changed

‎reference/forms/types/birthday.rst‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ option defaults to 120 years ago to the current year.
3737
| | |
3838
| | from the :doc:`FormType </reference/forms/types/form>`: |
3939
| | |
40+
| | - `attr`_ |
4041
| | - `data`_ |
4142
| | - `disabled`_ |
4243
| | - `help`_ |
@@ -46,6 +47,7 @@ option defaults to 120 years ago to the current year.
4647
| | - `invalid_message`_ |
4748
| | - `invalid_message_parameters`_ |
4849
| | - `mapped`_ |
50+
| | - `row_attr`_ |
4951
+----------------------+-------------------------------------------------------------------------------+
5052
| Parent type | :doc:`DateType </reference/forms/types/date>` |
5153
+----------------------+-------------------------------------------------------------------------------+
@@ -112,6 +114,8 @@ values for the year, month and day fields::
112114

113115
These options inherit from the :doc:`FormType </reference/forms/types/form>`:
114116

117+
.. include:: /reference/forms/types/options/attr.rst.inc
118+
115119
.. include:: /reference/forms/types/options/data.rst.inc
116120

117121
.. include:: /reference/forms/types/options/disabled.rst.inc
@@ -129,3 +133,5 @@ These options inherit from the :doc:`FormType </reference/forms/types/form>`:
129133
.. include:: /reference/forms/types/options/invalid_message_parameters.rst.inc
130134

131135
.. include:: /reference/forms/types/options/mapped.rst.inc
136+
137+
.. include:: /reference/forms/types/options/row_attr.rst.inc

‎reference/forms/types/button.rst‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ A simple, non-responsive button.
1414
| | - `disabled`_ |
1515
| | - `label`_ |
1616
| | - `label_translation_parameters`_ |
17+
| | - `row_attr`_ |
1718
| | - `translation_domain`_ |
1819
+----------------------+----------------------------------------------------------------------+
1920
| Parent type | none |
@@ -91,3 +92,5 @@ option of its parents, so buttons can reuse and/or override any of the parent
9192
placeholders.
9293

9394
.. include:: /reference/forms/types/options/attr_translation_parameters.rst.inc
95+
96+
.. include:: /reference/forms/types/options/row_attr.rst.inc

‎reference/forms/types/checkbox.rst‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,9 @@ if you want to handle submitted values like "0" or "false").
2020
| Overridden | - `compound`_ |
2121
| options | - `empty_data`_ |
2222
+-------------+------------------------------------------------------------------------+
23-
| Inherited | - `data`_ |
24-
| options | - `disabled`_ |
23+
| Inherited | - `attr`_ |
24+
| options | - `data`_ |
25+
| | - `disabled`_ |
2526
| | - `error_bubbling`_ |
2627
| | - `error_mapping`_ |
2728
| | - `help`_ |
@@ -32,6 +33,7 @@ if you want to handle submitted values like "0" or "false").
3233
| | - `label_format`_ |
3334
| | - `mapped`_ |
3435
| | - `required`_ |
36+
| | - `row_attr`_ |
3537
+-------------+------------------------------------------------------------------------+
3638
| Parent type | :doc:`FormType </reference/forms/types/form>` |
3739
+-------------+------------------------------------------------------------------------+
@@ -77,6 +79,8 @@ Inherited Options
7779

7880
These options inherit from the :doc:`FormType </reference/forms/types/form>`:
7981

82+
.. include:: /reference/forms/types/options/attr.rst.inc
83+
8084
.. include:: /reference/forms/types/options/data.rst.inc
8185

8286
.. include:: /reference/forms/types/options/disabled.rst.inc
@@ -101,6 +105,8 @@ These options inherit from the :doc:`FormType </reference/forms/types/form>`:
101105

102106
.. include:: /reference/forms/types/options/required.rst.inc
103107

108+
.. include:: /reference/forms/types/options/row_attr.rst.inc
109+
104110
Form Variables
105111
--------------
106112

‎reference/forms/types/choice.rst‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ To use this field, you must specify *either* ``choices`` or ``choice_loader`` op
4444
| | - `label_format`_ |
4545
| | - `mapped`_ |
4646
| | - `required`_ |
47+
| | - `row_attr`_ |
4748
| | - `translation_domain`_ |
4849
| | - `label_translation_parameters`_ |
4950
| | - `attr_translation_parameters`_ |
@@ -298,6 +299,8 @@ These options inherit from the :doc:`FormType </reference/forms/types/form>`:
298299

299300
.. include:: /reference/forms/types/options/required.rst.inc
300301

302+
.. include:: /reference/forms/types/options/row_attr.rst.inc
303+
301304
.. include:: /reference/forms/types/options/choice_type_translation_domain.rst.inc
302305

303306
.. include:: /reference/forms/types/options/label_translation_parameters.rst.inc

‎reference/forms/types/collection.rst‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,9 @@ photos).
2323
| | - `prototype_data`_ |
2424
| | - `prototype_name`_ |
2525
+-------------+-----------------------------------------------------------------------------+
26-
| Inherited | - `by_reference`_ |
27-
| options | - `empty_data`_ |
26+
| Inherited | - `attr`_ |
27+
| options | - `by_reference`_ |
28+
| | - `empty_data`_ |
2829
| | - `error_bubbling`_ |
2930
| | - `error_mapping`_ |
3031
| | - `help`_ |
@@ -35,6 +36,7 @@ photos).
3536
| | - `label_format`_ |
3637
| | - `mapped`_ |
3738
| | - `required`_ |
39+
| | - `row_attr`_ |
3840
+-------------+-----------------------------------------------------------------------------+
3941
| Parent type | :doc:`FormType </reference/forms/types/form>` |
4042
+-------------+-----------------------------------------------------------------------------+
@@ -400,6 +402,8 @@ Inherited Options
400402
These options inherit from the :doc:`FormType </reference/forms/types/form>`.
401403
Not all options are listed here - only the most applicable to this type:
402404

405+
.. include:: /reference/forms/types/options/attr.rst.inc
406+
403407
.. _reference-form-types-by-reference:
404408

405409
.. include:: /reference/forms/types/options/by_reference.rst.inc
@@ -437,6 +441,8 @@ error_bubbling
437441

438442
.. include:: /reference/forms/types/options/required.rst.inc
439443

444+
.. include:: /reference/forms/types/options/row_attr.rst.inc
445+
440446
Field Variables
441447
---------------
442448

‎reference/forms/types/color.rst‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,9 @@ element.
1717
+-------------+---------------------------------------------------------------------+
1818
| Rendered as | ``input`` ``color`` field (a text box) |
1919
+-------------+---------------------------------------------------------------------+
20-
| Inherited | - `data`_ |
21-
| options | - `disabled`_ |
20+
| Inherited | - `attr`_ |
21+
| options | - `data`_ |
22+
| | - `disabled`_ |
2223
| | - `empty_data`_ |
2324
| | - `error_bubbling`_ |
2425
| | - `error_mapping`_ |
@@ -30,6 +31,7 @@ element.
3031
| | - `label_format`_ |
3132
| | - `mapped`_ |
3233
| | - `required`_ |
34+
| | - `row_attr`_ |
3335
| | - `trim`_ |
3436
+-------------+---------------------------------------------------------------------+
3537
| Parent type | :doc:`TextType </reference/forms/types/text>` |
@@ -44,6 +46,8 @@ Inherited Options
4446

4547
These options inherit from the :doc:`FormType </reference/forms/types/form>`:
4648

49+
.. include:: /reference/forms/types/options/attr.rst.inc
50+
4751
.. include:: /reference/forms/types/options/data.rst.inc
4852

4953
.. include:: /reference/forms/types/options/disabled.rst.inc
@@ -76,4 +80,6 @@ The default value is ``''`` (the empty string).
7680

7781
.. include:: /reference/forms/types/options/required.rst.inc
7882

83+
.. include:: /reference/forms/types/options/row_attr.rst.inc
84+
7985
.. include:: /reference/forms/types/options/trim.rst.inc

‎reference/forms/types/country.rst‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ the option manually, but then you should just use the ``ChoiceType`` directly.
3838
| | |
3939
| | from the :doc:`FormType </reference/forms/types/form>` |
4040
| | |
41+
| | - `attr`_ |
4142
| | - `data`_ |
4243
| | - `disabled`_ |
4344
| | - `empty_data`_ |
@@ -49,6 +50,7 @@ the option manually, but then you should just use the ``ChoiceType`` directly.
4950
| | - `label_format`_ |
5051
| | - `mapped`_ |
5152
| | - `required`_ |
53+
| | - `row_attr`_ |
5254
+-------------+-----------------------------------------------------------------------+
5355
| Parent type | :doc:`ChoiceType </reference/forms/types/choice>` |
5456
+-------------+-----------------------------------------------------------------------+
@@ -99,6 +101,8 @@ These options inherit from the :doc:`ChoiceType </reference/forms/types/choice>`
99101

100102
These options inherit from the :doc:`FormType </reference/forms/types/form>`:
101103

104+
.. include:: /reference/forms/types/options/attr.rst.inc
105+
102106
.. include:: /reference/forms/types/options/data.rst.inc
103107

104108
.. include:: /reference/forms/types/options/disabled.rst.inc
@@ -130,3 +134,5 @@ The actual default value of this option depends on other field options:
130134
.. include:: /reference/forms/types/options/mapped.rst.inc
131135

132136
.. include:: /reference/forms/types/options/required.rst.inc
137+
138+
.. include:: /reference/forms/types/options/row_attr.rst.inc

‎reference/forms/types/currency.rst‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ manually, but then you should just use the ``ChoiceType`` directly.
3030
| | |
3131
| | from the :doc:`FormType </reference/forms/types/form>` type |
3232
| | |
33+
| | - `attr`_ |
3334
| | - `data`_ |
3435
| | - `disabled`_ |
3536
| | - `empty_data`_ |
@@ -41,6 +42,7 @@ manually, but then you should just use the ``ChoiceType`` directly.
4142
| | - `label_format`_ |
4243
| | - `mapped`_ |
4344
| | - `required`_ |
45+
| | - `row_attr`_ |
4446
+-------------+------------------------------------------------------------------------+
4547
| Parent type | :doc:`ChoiceType </reference/forms/types/choice>` |
4648
+-------------+------------------------------------------------------------------------+
@@ -88,6 +90,8 @@ These options inherit from the :doc:`ChoiceType </reference/forms/types/choice>`
8890

8991
These options inherit from the :doc:`FormType </reference/forms/types/form>`:
9092

93+
.. include:: /reference/forms/types/options/attr.rst.inc
94+
9195
.. include:: /reference/forms/types/options/data.rst.inc
9296

9397
.. include:: /reference/forms/types/options/disabled.rst.inc
@@ -120,4 +124,6 @@ The actual default value of this option depends on other field options:
120124

121125
.. include:: /reference/forms/types/options/required.rst.inc
122126

127+
.. include:: /reference/forms/types/options/row_attr.rst.inc
128+
123129
.. _`3-letter ISO 4217`: https://en.wikipedia.org/wiki/ISO_4217

‎reference/forms/types/date.rst‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,9 @@ and can understand a number of different input formats via the `input`_ option.
3333
| | - `data_class`_ |
3434
| | - `error_bubbling`_ |
3535
+----------------------+-----------------------------------------------------------------------------+
36-
| Inherited | - `data`_ |
37-
| options | - `disabled`_ |
36+
| Inherited | - `attr`_ |
37+
| options | - `data`_ |
38+
| | - `disabled`_ |
3839
| | - `error_mapping`_ |
3940
| | - `help`_ |
4041
| | - `help_attr`_ |
@@ -43,6 +44,7 @@ and can understand a number of different input formats via the `input`_ option.
4344
| | - `invalid_message`_ |
4445
| | - `invalid_message_parameters`_ |
4546
| | - `mapped`_ |
47+
| | - `row_attr`_ |
4648
+----------------------+-----------------------------------------------------------------------------+
4749
| Parent type | :doc:`FormType </reference/forms/types/form>` |
4850
+----------------------+-----------------------------------------------------------------------------+
@@ -218,6 +220,8 @@ Inherited Options
218220

219221
These options inherit from the :doc:`FormType </reference/forms/types/form>`:
220222

223+
.. include:: /reference/forms/types/options/attr.rst.inc
224+
221225
.. include:: /reference/forms/types/options/data.rst.inc
222226

223227
.. include:: /reference/forms/types/options/disabled.rst.inc
@@ -238,6 +242,8 @@ These options inherit from the :doc:`FormType </reference/forms/types/form>`:
238242

239243
.. include:: /reference/forms/types/options/mapped.rst.inc
240244

245+
.. include:: /reference/forms/types/options/row_attr.rst.inc
246+
241247
Field Variables
242248
---------------
243249

0 commit comments

Comments
 (0)