NotificationsYou must be signed in to change notification settings
Fork0
Star0

Commit5f7e00e

committed

Merge branch '2.1' into 2.2

2 parents8fa24cd +7ae32e2 commit5f7e00eCopy full SHA for 5f7e00e

File tree

25 files changed

+114

-2

lines changed

reference/forms/types

25 files changed

+114

-2

lines changed

`‎reference/forms/types/checkbox.rst‎`

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@ if the box is unchecked, the value will be set to false.`
`18`	`18`	\|\| - `read_only`_\|
`19`	`19`	\|\| - `disabled`_\|
`20`	`20`	\|\| - `error_bubbling`_\|
	`21`	+\|\| - `error_mapping`_\|
`21`	`22`	\|\| - `mapped`_\|
`22`	`23`	`+-------------+------------------------------------------------------------------------+`
`23`	`24`	\| Parent type\|:doc:`field</reference/forms/types/form>`\|
@@ -61,4 +62,6 @@ These options inherit from the :doc:`field</reference/forms/types/form>` type:
`61`	`62`
`62`	`63`	`..include::/reference/forms/types/options/error_bubbling.rst.inc`
`63`	`64`
	`65`	`+..include::/reference/forms/types/options/error_mapping.rst.inc`
	`66`	`+`
`64`	`67`	`..include::/reference/forms/types/options/mapped.rst.inc`

`‎reference/forms/types/choice.rst‎`

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,7 @@ option.`
`25`	`25`	\|\| - `read_only`_\|
`26`	`26`	\|\| - `disabled`_\|
`27`	`27`	\|\| - `error_bubbling`_\|
	`28`	+\|\| - `error_mapping`_\|
`28`	`29`	\|\| - `mapped`_\|
`29`	`30`	\|\| - `virtual`_\|
`30`	`31`	\|\| - `by_reference`_\|
@@ -121,6 +122,8 @@ These options inherit from the :doc:`field</reference/forms/types/form>` type:
`121`	`122`
`122`	`123`	`..include::/reference/forms/types/options/error_bubbling.rst.inc`
`123`	`124`
	`125`	`+..include::/reference/forms/types/options/error_mapping.rst.inc`
	`126`	`+`
`124`	`127`	`..include::/reference/forms/types/options/mapped.rst.inc`
`125`	`128`
`126`	`129`	`..include::/reference/forms/types/options/virtual.rst.inc`

`‎reference/forms/types/collection.rst‎`

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,7 @@ forms, which is useful when creating forms that expose one-to-many relationships`
`22`	`22`	`+-------------+-----------------------------------------------------------------------------+`
`23`	`23`	\| Inherited\| - `label`_\|
`24`	`24`	\| options\| - `error_bubbling`_\|
	`25`	+\|\| - `error_mapping`_\|
`25`	`26`	\|\| - `by_reference`_\|
`26`	`27`	\|\| - `empty_data`_\|
`27`	`28`	\|\| - `mapped`_\|
`@@ -345,6 +346,8 @@ Not all options are listed here - only the most applicable to this type:`
`345`	`346`
`346`	`347`	`..include::/reference/forms/types/options/mapped.rst.inc`
`347`	`348`
	`349`	`+..include::/reference/forms/types/options/error_mapping.rst.inc`
	`350`	`+`
`348`	`351`	`error_bubbling`
`349`	`352`	`~~~~~~~~~~~~~~`
`350`	`353`

`‎reference/forms/types/country.rst‎`

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
@@ -30,6 +30,7 @@ you should just use the ``choice`` type directly.
`30`	`30`	\|\| - `preferred_choices`_\|
`31`	`31`	\|\| - `empty_value`_\|
`32`	`32`	\|\| - `error_bubbling`_\|
	`33`	+\|\| - `error_mapping`_\|
`33`	`34`	\|\| - `required`_\|
`34`	`35`	\|\| - `label`_\|
`35`	`36`	\|\| - `read_only`_\|
@@ -68,6 +69,8 @@ These options inherit from the :doc:`choice</reference/forms/types/choice>` type
`68`	`69`
`69`	`70`	`..include::/reference/forms/types/options/error_bubbling.rst.inc`
`70`	`71`
	`72`	`+..include::/reference/forms/types/options/error_mapping.rst.inc`
	`73`	`+`
`71`	`74`	These options inherit from the:doc:`date</reference/forms/types/form>` type:
`72`	`75`
`73`	`76`	`..include::/reference/forms/types/options/required.rst.inc`

`‎reference/forms/types/date.rst‎`

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
@@ -38,6 +38,7 @@ day, and year) or three select boxes (see the `widget_` option).
`38`	`38`	\|\| - `disabled`_\|
`39`	`39`	\|\| - `mapped`_\|
`40`	`40`	\|\| - `virtual`_\|
	`41`	+\|\| - `error_mapping`_\|
`41`	`42`	`+----------------------+-----------------------------------------------------------------------------+`
`42`	`43`	\| Parent type\| ``field`` (if text), ``form`` otherwise\|
`43`	`44`	`+----------------------+-----------------------------------------------------------------------------+`
@@ -148,3 +149,5 @@ These options inherit from the :doc:`field</reference/forms/types/form>` type:
`148`	`149`	`..include::/reference/forms/types/options/mapped.rst.inc`
`149`	`150`
`150`	`151`	`..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 number	Diff line number	Diff line change
@@ -17,6 +17,7 @@ The ``email`` field is a text field that is rendered using the HTML5
`17`	`17`	\|\| - `read_only`_\|
`18`	`18`	\|\| - `disabled`_\|
`19`	`19`	\|\| - `error_bubbling`_\|
	`20`	+\|\| - `error_mapping`_\|
`20`	`21`	\|\| - `mapped`_\|
`21`	`22`	`+-------------+---------------------------------------------------------------------+`
`22`	`23`	\| Parent type\|:doc:`field</reference/forms/types/form>`\|
@@ -43,4 +44,6 @@ These options inherit from the :doc:`field</reference/forms/types/form>` type:
`43`	`44`
`44`	`45`	`..include::/reference/forms/types/options/error_bubbling.rst.inc`
`45`	`46`
`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 number	Diff line number	Diff line change
`@@ -30,6 +30,7 @@ objects from the database.`
`30`	`30`	\|\| - `read_only`_\|
`31`	`31`	\|\| - `disabled`_\|
`32`	`32`	\|\| - `error_bubbling`_\|
	`33`	+\|\| - `error_mapping`_\|
`33`	`34`	\|\| - `mapped`_\|
`34`	`35`	`+-------------+------------------------------------------------------------------+`
`35`	`36`	\| Parent type\|:doc:`choice</reference/forms/types/choice>`\|
@@ -173,4 +174,6 @@ These options inherit from the :doc:`field</reference/forms/types/form>` type:
`173`	`174`
`174`	`175`	`..include::/reference/forms/types/options/error_bubbling.rst.inc`
`175`	`176`
	`177`	`+..include::/reference/forms/types/options/error_mapping.rst.inc`
	`178`	`+`
`176`	`179`	`..include::/reference/forms/types/options/mapped.rst.inc`

`‎reference/forms/types/file.rst‎`

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
@@ -14,6 +14,7 @@ The ``file`` type represents a file input in your form.
`14`	`14`	\|\| - `read_only`_\|
`15`	`15`	\|\| - `disabled`_\|
`16`	`16`	\|\| - `error_bubbling`_\|
	`17`	+\|\| - `error_mapping`_\|
`17`	`18`	\|\| - `mapped`_\|
`18`	`19`	`+-------------+---------------------------------------------------------------------+`
`19`	`20`	\| Parent type\|:doc:`form</reference/forms/types/form>`\|
@@ -95,4 +96,6 @@ These options inherit from the :doc:`field</reference/forms/types/form>` type:
`95`	`96`
`96`	`97`	`..include::/reference/forms/types/options/error_bubbling.rst.inc`
`97`	`98`
	`99`	`+..include::/reference/forms/types/options/error_mapping.rst.inc`
	`100`	`+`
`98`	`101`	`..include::/reference/forms/types/options/mapped.rst.inc`

`‎reference/forms/types/hidden.rst‎`

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@ The hidden type represents a hidden input field.`
`15`	`15`	\| Inherited\| - `data`_\|
`16`	`16`	\| options\| - `property_path`_\|
`17`	`17`	\|\| - `mapped`_\|
	`18`	+\|\| - `error_mapping`_\|
`18`	`19`	`+-------------+----------------------------------------------------------------------+`
`19`	`20`	\| Parent type\|:doc:`field</reference/forms/types/form>`\|
`20`	`21`	`+-------------+----------------------------------------------------------------------+`
@@ -48,3 +49,5 @@ These options inherit from the :doc:`date</reference/forms/types/form>` type:
`48`	`49`	`..include::/reference/forms/types/options/property_path.rst.inc`
`49`	`50`
`50`	`51`	`..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 number	Diff line number	Diff line change
`@@ -23,6 +23,7 @@ integers. By default, all non-integer values (e.g. 6.78) will round down (e.g. 6`
`23`	`23`	\|\| - `read_only`_\|
`24`	`24`	\|\| - `disabled`_\|
`25`	`25`	\|\| - `error_bubbling`_\|
	`26`	+\|\| - `error_mapping`_\|
`26`	`27`	\|\| - `invalid_message`_\|
`27`	`28`	\|\| - `invalid_message_parameters`_\|
`28`	`29`	\|\| - `mapped`_\|
@@ -73,6 +74,8 @@ These options inherit from the :doc:`field</reference/forms/types/form>` type:
`73`	`74`
`74`	`75`	`..include::/reference/forms/types/options/error_bubbling.rst.inc`
`75`	`76`
	`77`	`+..include::/reference/forms/types/options/error_mapping.rst.inc`
	`78`	`+`
`76`	`79`	`..include::/reference/forms/types/options/invalid_message.rst.inc`
`77`	`80`
`78`	`81`	`..include::/reference/forms/types/options/invalid_message_parameters.rst.inc`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit5f7e00e

File tree

25 files changed

25 files changed

`‎reference/forms/types/checkbox.rst‎`

`‎reference/forms/types/choice.rst‎`

`‎reference/forms/types/collection.rst‎`

`‎reference/forms/types/country.rst‎`

`‎reference/forms/types/date.rst‎`

`‎reference/forms/types/email.rst‎`

`‎reference/forms/types/entity.rst‎`

`‎reference/forms/types/file.rst‎`

`‎reference/forms/types/hidden.rst‎`

`‎reference/forms/types/integer.rst‎`

0 commit comments