From 1c8135a3cde8f77586250f793d4d25abc94864f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= Date: Wed, 30 Oct 2013 13:27:49 +0100 Subject: [PATCH] =?UTF-8?q?restore=20question=20about=20"envois=20recomman?= =?UTF-8?q?d=C3=A9s"=20(#3911)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AvisSimplif.odt | Bin 49938 -> 50087 bytes AvisSimplif.py | 14 +++++++++++++- skins/Avis/avissimplif_edit.pt | 1 + skins/Avis/avissimplif_view.pt | 5 +++++ 4 files changed, 19 insertions(+), 1 deletion(-) diff --git a/AvisSimplif.odt b/AvisSimplif.odt index ef9bd465c7170caf17b4f47a3b9ee41d52127d06..ace8a3355f27aec8ad2880e1d5e9af688f2a6bb3 100644 GIT binary patch delta 5141 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 SC<3*+lX}A^21UI90000UXqplL diff --git a/AvisSimplif.py b/AvisSimplif.py index 7d7d94a..2956dea 100644 --- a/AvisSimplif.py +++ b/AvisSimplif.py @@ -255,7 +255,7 @@ schema = Schema(( name='envoi', widget=MasterSelectWidget( label=u"Est-il pertinent d'aborder la question de la transmission de documents ?", - slave_fields= slaveFields('showIfYes', 'envoiAnalyse'), + slave_fields= slaveFields('showIfYes', 'envoiAnalyse', 'envoiRecommande'), label_msgid='Avis_label_envoi', i18n_domain='Avis', ), @@ -264,6 +264,18 @@ schema = Schema(( required=True ), + StringField( + name='envoiRecommande', + widget=MasterSelectWidget( + label=u"Y a-t-il des envois recommandés ?", + label_msgid='Avis_label_envoiRecommande', + i18n_domain='Avis', + ), + enforceVocabulary=True, + vocabulary='getResponses', + required=True + ), + TextField( name='envoiAnalyse', widget=TextAreaWidget( diff --git a/skins/Avis/avissimplif_edit.pt b/skins/Avis/avissimplif_edit.pt index 33025f0..76f0375 100644 --- a/skins/Avis/avissimplif_edit.pt +++ b/skins/Avis/avissimplif_edit.pt @@ -39,6 +39,7 @@
Les envois +
Le principe de confiance diff --git a/skins/Avis/avissimplif_view.pt b/skins/Avis/avissimplif_view.pt index 5f203e9..a485e42 100644 --- a/skins/Avis/avissimplif_view.pt +++ b/skins/Avis/avissimplif_view.pt @@ -72,6 +72,11 @@
+ +
+   +
+