# HG changeset patch # User Thierry Florac # Date 1528117216 -7200 # Node ID e61e7effa80a1124202c3fd90bc4d080b6b89c07 # Parent 1c2320ddd9c667d426cd593fb6f2bbec60be1af9 Updated fields order diff -r 1c2320ddd9c6 -r e61e7effa80a src/pyams_content/component/paragraph/contact.py --- a/src/pyams_content/component/paragraph/contact.py Mon Jun 04 14:43:20 2018 +0200 +++ b/src/pyams_content/component/paragraph/contact.py Mon Jun 04 15:00:16 2018 +0200 @@ -48,14 +48,14 @@ name = FieldProperty(IContactParagraph['name']) charge = FieldProperty(IContactParagraph['charge']) + contact_email = FieldProperty(IContactParagraph['contact_email']) + contact_form = FieldProperty(IContactParagraph['contact_form']) _photo = FileProperty(IContactParagraph['photo']) if have_gis: gps_location = FieldProperty(IContactParagraph['gps_location']) address = FieldProperty(IContactParagraph['address']) - contact_email = FieldProperty(IContactParagraph['contact_email']) - contact_form = FieldProperty(IContactParagraph['contact_form']) renderer = FieldProperty(IContactParagraph['renderer']) @property diff -r 1c2320ddd9c6 -r e61e7effa80a src/pyams_content/component/paragraph/interfaces/contact.py --- a/src/pyams_content/component/paragraph/interfaces/contact.py Mon Jun 04 14:43:20 2018 +0200 +++ b/src/pyams_content/component/paragraph/interfaces/contact.py Mon Jun 04 15:00:16 2018 +0200 @@ -54,6 +54,15 @@ description=_("Label of contact function"), required=False) + contact_email = MailAddressField(title=_("Email address"), + description=_("Contact email address"), + required=False) + + contact_form = InternalReference(title=_("Contact form"), + description=_("Reference of contact form"), + required=False, + content_type=FORM_CONTENT_TYPE) + photo = ImageField(title=_("Photo"), description=_("Use 'browse' button to select contact picture"), required=False) @@ -66,15 +75,6 @@ address = Text(title=_("Address"), required=False) - contact_email = MailAddressField(title=_("Email address"), - description=_("Contact email address"), - required=False) - - contact_form = InternalReference(title=_("Contact form"), - description=_("Reference of contact form"), - required=False, - content_type=FORM_CONTENT_TYPE) - renderer = Choice(title=_("Contact template"), description=_("Presentation template used for this contact"), vocabulary=CONTACT_PARAGRAPH_RENDERERS,