Skip to content

Commit 5f7e00e

Browse files
weaverryanweaverryan
committed
Merge branch '2.1' into 2.2
2 parents 8fa24cd + 7ae32e2 commit 5f7e00e

25 files changed

+114
-2
lines changed

‎reference/forms/types/checkbox.rst

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ if the box is unchecked, the value will be set to false.
1818
| | - `read_only`_ |
1919
| | - `disabled`_ |
2020
| | - `error_bubbling`_ |
21+
| | - `error_mapping`_ |
2122
| | - `mapped`_ |
2223
+-------------+------------------------------------------------------------------------+
2324
| Parent type | :doc:`field</reference/forms/types/form>` |
@@ -61,4 +62,6 @@ These options inherit from the :doc:`field</reference/forms/types/form>` type:
6162

6263
.. include:: /reference/forms/types/options/error_bubbling.rst.inc
6364

65+
.. include:: /reference/forms/types/options/error_mapping.rst.inc
66+
6467
.. include:: /reference/forms/types/options/mapped.rst.inc

‎reference/forms/types/choice.rst

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ option.
2525
| | - `read_only`_ |
2626
| | - `disabled`_ |
2727
| | - `error_bubbling`_ |
28+
| | - `error_mapping`_ |
2829
| | - `mapped`_ |
2930
| | - `virtual`_ |
3031
| | - `by_reference`_ |
@@ -121,6 +122,8 @@ These options inherit from the :doc:`field</reference/forms/types/form>` type:
121122

122123
.. include:: /reference/forms/types/options/error_bubbling.rst.inc
123124

125+
.. include:: /reference/forms/types/options/error_mapping.rst.inc
126+
124127
.. include:: /reference/forms/types/options/mapped.rst.inc
125128

126129
.. include:: /reference/forms/types/options/virtual.rst.inc

‎reference/forms/types/collection.rst

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ forms, which is useful when creating forms that expose one-to-many relationships
2222
+-------------+-----------------------------------------------------------------------------+
2323
| Inherited | - `label`_ |
2424
| options | - `error_bubbling`_ |
25+
| | - `error_mapping`_ |
2526
| | - `by_reference`_ |
2627
| | - `empty_data`_ |
2728
| | - `mapped`_ |
@@ -345,6 +346,8 @@ Not all options are listed here - only the most applicable to this type:
345346

346347
.. include:: /reference/forms/types/options/mapped.rst.inc
347348

349+
.. include:: /reference/forms/types/options/error_mapping.rst.inc
350+
348351
error_bubbling
349352
~~~~~~~~~~~~~~
350353

‎reference/forms/types/country.rst

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ you should just use the ``choice`` type directly.
3030
| | - `preferred_choices`_ |
3131
| | - `empty_value`_ |
3232
| | - `error_bubbling`_ |
33+
| | - `error_mapping`_ |
3334
| | - `required`_ |
3435
| | - `label`_ |
3536
| | - `read_only`_ |
@@ -68,6 +69,8 @@ These options inherit from the :doc:`choice</reference/forms/types/choice>` type
6869

6970
.. include:: /reference/forms/types/options/error_bubbling.rst.inc
7071

72+
.. include:: /reference/forms/types/options/error_mapping.rst.inc
73+
7174
These options inherit from the :doc:`date</reference/forms/types/form>` type:
7275

7376
.. include:: /reference/forms/types/options/required.rst.inc

‎reference/forms/types/date.rst

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ day, and year) or three select boxes (see the `widget_` option).
3838
| | - `disabled`_ |
3939
| | - `mapped`_ |
4040
| | - `virtual`_ |
41+
| | - `error_mapping`_ |
4142
+----------------------+-----------------------------------------------------------------------------+
4243
| Parent type | ``field`` (if text), ``form`` otherwise |
4344
+----------------------+-----------------------------------------------------------------------------+
@@ -148,3 +149,5 @@ These options inherit from the :doc:`field</reference/forms/types/form>` type:
148149
.. include:: /reference/forms/types/options/mapped.rst.inc
149150

150151
.. include:: /reference/forms/types/options/virtual.rst.inc
152+
153+
.. include:: /reference/forms/types/options/error_mapping.rst.inc

‎reference/forms/types/email.rst

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ The ``email`` field is a text field that is rendered using the HTML5
1717
| | - `read_only`_ |
1818
| | - `disabled`_ |
1919
| | - `error_bubbling`_ |
20+
| | - `error_mapping`_ |
2021
| | - `mapped`_ |
2122
+-------------+---------------------------------------------------------------------+
2223
| Parent type | :doc:`field</reference/forms/types/form>` |
@@ -43,4 +44,6 @@ These options inherit from the :doc:`field</reference/forms/types/form>` type:
4344

4445
.. include:: /reference/forms/types/options/error_bubbling.rst.inc
4546

46-
.. include:: /reference/forms/types/options/mapped.rst.inc
47+
.. include:: /reference/forms/types/options/error_mapping.rst.inc
48+
49+
.. include:: /reference/forms/types/options/mapped.rst.inc

‎reference/forms/types/entity.rst

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ objects from the database.
3030
| | - `read_only`_ |
3131
| | - `disabled`_ |
3232
| | - `error_bubbling`_ |
33+
| | - `error_mapping`_ |
3334
| | - `mapped`_ |
3435
+-------------+------------------------------------------------------------------+
3536
| Parent type | :doc:`choice</reference/forms/types/choice>` |
@@ -173,4 +174,6 @@ These options inherit from the :doc:`field</reference/forms/types/form>` type:
173174

174175
.. include:: /reference/forms/types/options/error_bubbling.rst.inc
175176

177+
.. include:: /reference/forms/types/options/error_mapping.rst.inc
178+
176179
.. include:: /reference/forms/types/options/mapped.rst.inc

‎reference/forms/types/file.rst

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ The ``file`` type represents a file input in your form.
1414
| | - `read_only`_ |
1515
| | - `disabled`_ |
1616
| | - `error_bubbling`_ |
17+
| | - `error_mapping`_ |
1718
| | - `mapped`_ |
1819
+-------------+---------------------------------------------------------------------+
1920
| Parent type | :doc:`form</reference/forms/types/form>` |
@@ -95,4 +96,6 @@ These options inherit from the :doc:`field</reference/forms/types/form>` type:
9596

9697
.. include:: /reference/forms/types/options/error_bubbling.rst.inc
9798

99+
.. include:: /reference/forms/types/options/error_mapping.rst.inc
100+
98101
.. include:: /reference/forms/types/options/mapped.rst.inc

‎reference/forms/types/hidden.rst

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ The hidden type represents a hidden input field.
1515
| Inherited | - `data`_ |
1616
| options | - `property_path`_ |
1717
| | - `mapped`_ |
18+
| | - `error_mapping`_ |
1819
+-------------+----------------------------------------------------------------------+
1920
| Parent type | :doc:`field</reference/forms/types/form>` |
2021
+-------------+----------------------------------------------------------------------+
@@ -48,3 +49,5 @@ These options inherit from the :doc:`date</reference/forms/types/form>` type:
4849
.. include:: /reference/forms/types/options/property_path.rst.inc
4950

5051
.. include:: /reference/forms/types/options/mapped.rst.inc
52+
53+
.. include:: /reference/forms/types/options/error_mapping.rst.inc

‎reference/forms/types/integer.rst

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ integers. By default, all non-integer values (e.g. 6.78) will round down (e.g. 6
2323
| | - `read_only`_ |
2424
| | - `disabled`_ |
2525
| | - `error_bubbling`_ |
26+
| | - `error_mapping`_ |
2627
| | - `invalid_message`_ |
2728
| | - `invalid_message_parameters`_ |
2829
| | - `mapped`_ |
@@ -73,6 +74,8 @@ These options inherit from the :doc:`field</reference/forms/types/form>` type:
7374

7475
.. include:: /reference/forms/types/options/error_bubbling.rst.inc
7576

77+
.. include:: /reference/forms/types/options/error_mapping.rst.inc
78+
7679
.. include:: /reference/forms/types/options/invalid_message.rst.inc
7780

7881
.. include:: /reference/forms/types/options/invalid_message_parameters.rst.inc

0 commit comments

Comments
 (0)