Skip to content

Commit 1e0311e

Browse files
weaverryanweaverryan
committed
minor #3416 add empty_data option where required option is used (xabbuh)
This PR was merged into the 2.3 branch. Discussion ---------- add empty_data option where required option is used | Q | A | ------------- | --- | Doc fix? | yes | New docs? | no | Applies to | all | Fixed tickets | Commits ------- d9c6a85 add empty_data option where required option is used
2 parents 26b8146 + d9c6a85 commit 1e0311e

21 files changed

+78
-19
lines changed

‎reference/forms/types/checkbox.rst

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ if the box is unchecked, the value will be set to false.
1414
| Options | - `value`_ |
1515
+-------------+------------------------------------------------------------------------+
1616
| Inherited | - `data`_ |
17-
| options | - `required`_ |
17+
| options | - `empty_data`_ |
18+
| | - `required`_ |
1819
| | - `label`_ |
1920
| | - `label_attr`_ |
2021
| | - `read_only`_ |
@@ -60,6 +61,8 @@ These options inherit from the :doc:`form </reference/forms/types/form>` type:
6061

6162
.. include:: /reference/forms/types/options/data.rst.inc
6263

64+
.. include:: /reference/forms/types/options/empty_data.rst.inc
65+
6366
.. include:: /reference/forms/types/options/required.rst.inc
6467

6568
.. include:: /reference/forms/types/options/label.rst.inc

‎reference/forms/types/collection.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ forms, which is useful when creating forms that expose one-to-many relationships
2121
| | - `prototype_name`_ |
2222
+-------------+-----------------------------------------------------------------------------+
2323
| Inherited | - `label`_ |
24-
| | - `label_attr`_ |
25-
| options | - `error_bubbling`_ |
24+
| options | - `label_attr`_ |
25+
| | - `error_bubbling`_ |
2626
| | - `error_mapping`_ |
2727
| | - `by_reference`_ |
2828
| | - `empty_data`_ |

‎reference/forms/types/country.rst

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ you should just use the ``choice`` type directly.
3131
| | - `empty_value`_ |
3232
| | - `error_bubbling`_ |
3333
| | - `error_mapping`_ |
34+
| | - `empty_data`_ |
3435
| | - `required`_ |
3536
| | - `label`_ |
3637
| | - `label_attr`_ |
@@ -74,6 +75,8 @@ These options inherit from the :doc:`choice </reference/forms/types/choice>` typ
7475

7576
These options inherit from the :doc:`form </reference/forms/types/form>` type:
7677

78+
.. include:: /reference/forms/types/options/empty_data.rst.inc
79+
7780
.. include:: /reference/forms/types/options/required.rst.inc
7881

7982
.. include:: /reference/forms/types/options/label.rst.inc

‎reference/forms/types/currency.rst

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ should just use the ``choice`` type directly.
2424
| | - `preferred_choices`_ |
2525
| | - `empty_value`_ |
2626
| | - `error_bubbling`_ |
27+
| | - `empty_data`_ |
2728
| | - `required`_ |
2829
| | - `label`_ |
2930
| | - `label_attr`_ |
@@ -64,6 +65,8 @@ These options inherit from the :doc:`choice</reference/forms/types/choice>` type
6465

6566
These options inherit from the :doc:`form</reference/forms/types/form>` type:
6667

68+
.. include:: /reference/forms/types/options/empty_data.rst.inc
69+
6770
.. include:: /reference/forms/types/options/required.rst.inc
6871

6972
.. include:: /reference/forms/types/options/label.rst.inc

‎reference/forms/types/email.rst

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ The ``email`` field is a text field that is rendered using the HTML5
1111
| Rendered as | ``input`` ``email`` field (a text box) |
1212
+-------------+---------------------------------------------------------------------+
1313
| Inherited | - `max_length`_ |
14-
| options | - `required`_ |
14+
| options | - `empty_data`_ |
15+
| | - `required`_ |
1516
| | - `label`_ |
1617
| | - `label_attr`_ |
1718
| | - `data`_ |
@@ -34,6 +35,8 @@ These options inherit from the :doc:`form </reference/forms/types/form>` type:
3435

3536
.. include:: /reference/forms/types/options/max_length.rst.inc
3637

38+
.. include:: /reference/forms/types/options/empty_data.rst.inc
39+
3740
.. include:: /reference/forms/types/options/required.rst.inc
3841

3942
.. include:: /reference/forms/types/options/label.rst.inc

‎reference/forms/types/entity.rst

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ objects from the database.
2626
| options | - `expanded`_ |
2727
| | - `preferred_choices`_ |
2828
| | - `empty_value`_ |
29+
| | - `empty_data`_ |
2930
| | - `required`_ |
3031
| | - `label`_ |
3132
| | - `label_attr`_ |
@@ -196,6 +197,8 @@ These options inherit from the :doc:`choice </reference/forms/types/choice>` typ
196197

197198
These options inherit from the :doc:`form </reference/forms/types/form>` type:
198199

200+
.. include:: /reference/forms/types/options/empty_data.rst.inc
201+
199202
.. include:: /reference/forms/types/options/required.rst.inc
200203

201204
.. include:: /reference/forms/types/options/label.rst.inc

‎reference/forms/types/file.rst

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,9 @@ The ``file`` type represents a file input in your form.
99
+-------------+---------------------------------------------------------------------+
1010
| Rendered as | ``input`` ``file`` field |
1111
+-------------+---------------------------------------------------------------------+
12-
| Inherited | - `required`_ |
13-
| options | - `label`_ |
12+
| Inherited | - `empty_data`_ |
13+
| options | - `required`_ |
14+
| | - `label`_ |
1415
| | - `label_attr`_ |
1516
| | - `read_only`_ |
1617
| | - `disabled`_ |
@@ -82,6 +83,8 @@ Inherited options
8283

8384
These options inherit from the :doc:`form </reference/forms/types/form>` type:
8485

86+
.. include:: /reference/forms/types/options/empty_data.rst.inc
87+
8588
.. include:: /reference/forms/types/options/required.rst.inc
8689

8790
.. include:: /reference/forms/types/options/label.rst.inc

‎reference/forms/types/form.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ on all fields.
1515

1616
.. include:: /reference/forms/types/options/data_class.rst.inc
1717

18+
.. include:: /reference/forms/types/options/empty_data.rst.inc
19+
1820
.. include:: /reference/forms/types/options/required.rst.inc
1921

2022
.. include:: /reference/forms/types/options/label.rst.inc

‎reference/forms/types/integer.rst

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,9 @@ integers. By default, all non-integer values (e.g. 6.78) will round down (e.g. 6
1919
| | - `precision`_ |
2020
| | - `grouping`_ |
2121
+-------------+-----------------------------------------------------------------------+
22-
| Inherited | - `required`_ |
23-
| options | - `label`_ |
22+
| Inherited | - `empty_data`_ |
23+
| options | - `required`_ |
24+
| | - `label`_ |
2425
| | - `label_attr`_ |
2526
| | - `data`_ |
2627
| | - `read_only`_ |
@@ -69,6 +70,8 @@ Inherited options
6970

7071
These options inherit from the :doc:`form </reference/forms/types/form>` type:
7172

73+
.. include:: /reference/forms/types/options/empty_data.rst.inc
74+
7275
.. include:: /reference/forms/types/options/required.rst.inc
7376

7477
.. include:: /reference/forms/types/options/label.rst.inc

‎reference/forms/types/language.rst

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ you should just use the ``choice`` type directly.
3232
| | - `empty_value`_ |
3333
| | - `error_bubbling`_ |
3434
| | - `error_mapping`_ |
35+
| | - `empty_data`_ |
3536
| | - `required`_ |
3637
| | - `label`_ |
3738
| | - `label_attr`_ |
@@ -75,6 +76,8 @@ These options inherit from the :doc:`choice </reference/forms/types/choice>` typ
7576

7677
These options inherit from the :doc:`form </reference/forms/types/form>` type:
7778

79+
.. include:: /reference/forms/types/options/empty_data.rst.inc
80+
7881
.. include:: /reference/forms/types/options/required.rst.inc
7982

8083
.. include:: /reference/forms/types/options/label.rst.inc

0 commit comments

Comments
 (0)