Skip to content

Commit bdd729a

Browse files
weaverryanweaverryan
committed
Merge branch '2.4' into 2.5
* 2.4: [Reference] order form type options alphabetically Conflicts: reference/forms/types/collection.rst reference/forms/types/email.rst reference/forms/types/file.rst reference/forms/types/form.rst reference/forms/types/password.rst reference/forms/types/search.rst reference/forms/types/text.rst reference/forms/types/textarea.rst reference/forms/types/url.rst
2 parents d0ca865 + fb387a8 commit bdd729a

28 files changed

+790
-751
lines changed

‎reference/forms/types/birthday.rst

+25-20
Original file line numberDiff line numberDiff line change
@@ -20,23 +20,28 @@ option defaults to 120 years ago to the current year.
2020
+----------------------+-------------------------------------------------------------------------------+
2121
| Rendered as | can be three select boxes or 1 or 3 text boxes, based on the `widget`_ option |
2222
+----------------------+-------------------------------------------------------------------------------+
23-
| Overridden Options | - `years`_ |
23+
| Overridden options | - `years`_ |
2424
+----------------------+-------------------------------------------------------------------------------+
25-
| Inherited Options | - `widget`_ |
26-
| | - `input`_ |
27-
| | - `empty_value`_ |
28-
| | - `months`_ |
25+
| Inherited options | from the :doc:`date </reference/forms/types/date>` type: |
26+
| | |
2927
| | - `days`_ |
28+
| | - `empty_value`_ |
3029
| | - `format`_ |
30+
| | - `input`_ |
3131
| | - `model_timezone`_ |
32+
| | - `months`_ |
3233
| | - `view_timezone`_ |
34+
| | - `widget`_ |
35+
| | |
36+
| | from the :doc:`form </reference/forms/types/form>` type: |
37+
| | |
3338
| | - `data`_ |
39+
| | - `disabled`_ |
40+
| | - `inherit_data`_ |
3441
| | - `invalid_message`_ |
3542
| | - `invalid_message_parameters`_ |
36-
| | - `read_only`_ |
37-
| | - `disabled`_ |
3843
| | - `mapped`_ |
39-
| | - `inherit_data`_ |
44+
| | - `read_only`_ |
4045
+----------------------+-------------------------------------------------------------------------------+
4146
| Parent type | :doc:`date </reference/forms/types/date>` |
4247
+----------------------+-------------------------------------------------------------------------------+
@@ -59,34 +64,34 @@ Inherited Options
5964

6065
These options inherit from the :doc:`date </reference/forms/types/date>` type:
6166

62-
.. include:: /reference/forms/types/options/date_widget.rst.inc
63-
64-
.. include:: /reference/forms/types/options/date_input.rst.inc
67+
.. include:: /reference/forms/types/options/days.rst.inc
6568

6669
.. include:: /reference/forms/types/options/empty_value.rst.inc
6770

68-
.. include:: /reference/forms/types/options/months.rst.inc
69-
70-
.. include:: /reference/forms/types/options/days.rst.inc
71-
7271
.. include:: /reference/forms/types/options/date_format.rst.inc
7372

73+
.. include:: /reference/forms/types/options/date_input.rst.inc
74+
7475
.. include:: /reference/forms/types/options/model_timezone.rst.inc
7576

77+
.. include:: /reference/forms/types/options/months.rst.inc
78+
7679
.. include:: /reference/forms/types/options/view_timezone.rst.inc
7780

81+
.. include:: /reference/forms/types/options/date_widget.rst.inc
82+
7883
These options inherit from the :doc:`form </reference/forms/types/form>` type:
7984

8085
.. include:: /reference/forms/types/options/data.rst.inc
8186

82-
.. include:: /reference/forms/types/options/invalid_message.rst.inc
87+
.. include:: /reference/forms/types/options/disabled.rst.inc
8388

84-
.. include:: /reference/forms/types/options/invalid_message_parameters.rst.inc
89+
.. include:: /reference/forms/types/options/inherit_data.rst.inc
8590

86-
.. include:: /reference/forms/types/options/read_only.rst.inc
91+
.. include:: /reference/forms/types/options/invalid_message.rst.inc
8792

88-
.. include:: /reference/forms/types/options/disabled.rst.inc
93+
.. include:: /reference/forms/types/options/invalid_message_parameters.rst.inc
8994

9095
.. include:: /reference/forms/types/options/mapped.rst.inc
9196

92-
.. include:: /reference/forms/types/options/inherit_data.rst.inc
97+
.. include:: /reference/forms/types/options/read_only.rst.inc

‎reference/forms/types/checkbox.rst

+17-17
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,18 @@ if the box is unchecked, the value will be set to false.
1313
+-------------+------------------------------------------------------------------------+
1414
| Options | - `value`_ |
1515
+-------------+------------------------------------------------------------------------+
16-
| Overridden | - `empty_data`_ |
17-
| options | - `compound`_ |
16+
| Overridden | - `compound`_ |
17+
| options | - `empty_data`_ |
1818
+-------------+------------------------------------------------------------------------+
1919
| Inherited | - `data`_ |
20-
| options | - `required`_ |
21-
| | - `label`_ |
22-
| | - `label_attr`_ |
23-
| | - `read_only`_ |
24-
| | - `disabled`_ |
20+
| options | - `disabled`_ |
2521
| | - `error_bubbling`_ |
2622
| | - `error_mapping`_ |
23+
| | - `label`_ |
24+
| | - `label_attr`_ |
2725
| | - `mapped`_ |
26+
| | - `read_only`_ |
27+
| | - `required`_ |
2828
+-------------+------------------------------------------------------------------------+
2929
| Parent type | :doc:`form </reference/forms/types/form>` |
3030
+-------------+------------------------------------------------------------------------+
@@ -49,33 +49,33 @@ Field Options
4949
Overridden Options
5050
------------------
5151

52-
.. include:: /reference/forms/types/options/checkbox_empty_data.rst.inc
53-
5452
.. include:: /reference/forms/types/options/checkbox_compound.rst.inc
5553

54+
.. include:: /reference/forms/types/options/checkbox_empty_data.rst.inc
55+
5656
Inherited Options
5757
-----------------
5858

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

6161
.. include:: /reference/forms/types/options/data.rst.inc
6262

63-
.. include:: /reference/forms/types/options/required.rst.inc
64-
65-
.. include:: /reference/forms/types/options/label.rst.inc
66-
67-
.. include:: /reference/forms/types/options/label_attr.rst.inc
68-
69-
.. include:: /reference/forms/types/options/read_only.rst.inc
70-
7163
.. include:: /reference/forms/types/options/disabled.rst.inc
7264

7365
.. include:: /reference/forms/types/options/error_bubbling.rst.inc
7466

7567
.. include:: /reference/forms/types/options/error_mapping.rst.inc
7668

69+
.. include:: /reference/forms/types/options/label.rst.inc
70+
71+
.. include:: /reference/forms/types/options/label_attr.rst.inc
72+
7773
.. include:: /reference/forms/types/options/mapped.rst.inc
7874

75+
.. include:: /reference/forms/types/options/read_only.rst.inc
76+
77+
.. include:: /reference/forms/types/options/required.rst.inc
78+
7979
Form Variables
8080
--------------
8181

‎reference/forms/types/choice.rst

+31-31
Original file line numberDiff line numberDiff line change
@@ -15,25 +15,25 @@ option.
1515
+-------------+------------------------------------------------------------------------------+
1616
| Options | - `choices`_ |
1717
| | - `choice_list`_ |
18-
| | - `multiple`_ |
18+
| | - `empty_value`_ |
1919
| | - `expanded`_ |
20+
| | - `multiple`_ |
2021
| | - `preferred_choices`_ |
21-
| | - `empty_value`_ |
2222
+-------------+------------------------------------------------------------------------------+
23-
| Overridden | - `empty_data`_ |
24-
| options | - `compound`_ |
23+
| Overridden | - `compound`_ |
24+
| options | - `empty_data`_ |
2525
| | - `error_bubbling`_ |
2626
+-------------+------------------------------------------------------------------------------+
27-
| Inherited | - `required`_ |
28-
| options | - `label`_ |
29-
| | - `label_attr`_ |
30-
| | - `data`_ |
31-
| | - `read_only`_ |
27+
| Inherited | - `by_reference`_ |
28+
| options | - `data`_ |
3229
| | - `disabled`_ |
3330
| | - `error_mapping`_ |
34-
| | - `mapped`_ |
3531
| | - `inherit_data`_ |
36-
| | - `by_reference`_ |
32+
| | - `label`_ |
33+
| | - `label_attr`_ |
34+
| | - `mapped`_ |
35+
| | - `read_only`_ |
36+
| | - `required`_ |
3737
+-------------+------------------------------------------------------------------------------+
3838
| Parent type | :doc:`form </reference/forms/types/form>` |
3939
+-------------+------------------------------------------------------------------------------+
@@ -103,17 +103,25 @@ The ``choice_list`` option must be an instance of the ``ChoiceListInterface``.
103103
For more advanced cases, a custom class that implements the interface
104104
can be created to supply the choices.
105105

106-
.. include:: /reference/forms/types/options/multiple.rst.inc
106+
.. include:: /reference/forms/types/options/empty_value.rst.inc
107107

108108
.. include:: /reference/forms/types/options/expanded.rst.inc
109109

110-
.. include:: /reference/forms/types/options/preferred_choices.rst.inc
110+
.. include:: /reference/forms/types/options/multiple.rst.inc
111111

112-
.. include:: /reference/forms/types/options/empty_value.rst.inc
112+
.. include:: /reference/forms/types/options/preferred_choices.rst.inc
113113

114114
Overridden Options
115115
------------------
116116

117+
compound
118+
~~~~~~~~
119+
120+
**type**: ``boolean`` **default**: same value as ``expanded`` option
121+
122+
This option specifies if a form is compound. The value is by default
123+
overridden by the value of the ``expanded`` option.
124+
117125
.. include:: /reference/forms/types/options/empty_data.rst.inc
118126
:end-before: DEFAULT_PLACEHOLDER
119127

@@ -126,14 +134,6 @@ The actual default value of this option depends on other field options:
126134
.. include:: /reference/forms/types/options/empty_data.rst.inc
127135
:start-after: DEFAULT_PLACEHOLDER
128136

129-
compound
130-
~~~~~~~~
131-
132-
**type**: ``boolean`` **default**: same value as ``expanded`` option
133-
134-
This option specifies if a form is compound. The value is by default
135-
overridden by the value of the ``expanded`` option.
136-
137137
error_bubbling
138138
~~~~~~~~~~~~~~
139139

@@ -147,25 +147,25 @@ Inherited Options
147147

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

150-
.. include:: /reference/forms/types/options/required.rst.inc
151-
152-
.. include:: /reference/forms/types/options/label.rst.inc
153-
154-
.. include:: /reference/forms/types/options/label_attr.rst.inc
150+
.. include:: /reference/forms/types/options/by_reference.rst.inc
155151

156152
.. include:: /reference/forms/types/options/data.rst.inc
157153

158-
.. include:: /reference/forms/types/options/read_only.rst.inc
159-
160154
.. include:: /reference/forms/types/options/disabled.rst.inc
161155

162156
.. include:: /reference/forms/types/options/error_mapping.rst.inc
163157

158+
.. include:: /reference/forms/types/options/inherit_data.rst.inc
159+
160+
.. include:: /reference/forms/types/options/label.rst.inc
161+
162+
.. include:: /reference/forms/types/options/label_attr.rst.inc
163+
164164
.. include:: /reference/forms/types/options/mapped.rst.inc
165165

166-
.. include:: /reference/forms/types/options/inherit_data.rst.inc
166+
.. include:: /reference/forms/types/options/read_only.rst.inc
167167

168-
.. include:: /reference/forms/types/options/by_reference.rst.inc
168+
.. include:: /reference/forms/types/options/required.rst.inc
169169

170170
Field Variables
171171
---------------

0 commit comments

Comments
 (0)