From 5701966fa60315fa6040fe85e5e3c8d43cc02271 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= Date: Tue, 29 Nov 2011 23:25:48 +0100 Subject: [PATCH] reorder pfb document search fields --- tabellio/searchform/form.py | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/tabellio/searchform/form.py b/tabellio/searchform/form.py index 560b5e5..69e33de 100644 --- a/tabellio/searchform/form.py +++ b/tabellio/searchform/form.py @@ -451,22 +451,22 @@ class QuestionPfbSearchForm(QuestionSearchForm): class IDocumentPfbSearch(interface.Interface): search_type_is_document = schema.TextLine(title=u'Search Type', default=u'1') - nodoc = schema.TextLine(title=_(u'Document Number'), required=False) l_doctypes = schema.List(title=_(u'Document Types'), required=False, value_type=schema.Choice(title=_(u'Document Type'), required=False, source=possible_document_types)) + authors = schema.TextLine(title=_(u'Authors'), required=False) + #l_polgroups = schema.List(title=_(u'Political Groups'), required=False, + # value_type=schema.Choice(title=_(u'Political Group'), + # required=False, source=possible_polgroups)) + session = schema.Choice(title=_(u'Legislature / Session'), required=False, + source=possible_sessions) ttitle = schema.TextLine(title=_(u'Title'), required=False, description=_(u'Description for the title field')) - text = schema.TextLine(title=_(u'Text'), required=False) - authors = schema.TextLine(title=_(u'Authors'), required=False) - l_polgroups = schema.List(title=_(u'Political Groups'), required=False, - value_type=schema.Choice(title=_(u'Political Group'), - required=False, source=possible_polgroups)) l_topics = schema.List(title=_(u'Topics'), required=False, value_type=schema.Choice(required=False, source=possible_topics)); - session = schema.Choice(title=_(u'Legislature / Session'), required=False, - source=possible_sessions) + text = schema.TextLine(title=_(u'Text'), required=False) + nodoc = schema.TextLine(title=_(u'Document Number'), required=False) start = schema.Date(title=_(u'Start'), required=False) end = schema.Date(title=_(u'End'), required=False) @@ -499,21 +499,21 @@ class DocumentPfbSearchForm(form.Form): class IAdoptedDocumentPfbSearch(interface.Interface): search_type_is_adopteddocument = schema.TextLine(title=u'Search Type', default=u'1') - nodoc = schema.TextLine(title=_(u'Document Number'), required=False) l_doctypes = schema.List(title=_(u'Document Types'), required=False, value_type=schema.Choice(title=_(u'Document Type'), required=False, values=[_(u'Projets'), _(u'Propositions')])) - ttitle = schema.TextLine(title=_(u'Title'), required=False) - text = schema.TextLine(title=_(u'Text'), required=False) authors = schema.TextLine(title=_(u'Authors'), required=False) - l_polgroups = schema.List(title=_(u'Political Groups'), required=False, - value_type=schema.Choice(title=_(u'Political Group'), - required=False, source=possible_polgroups)) + #l_polgroups = schema.List(title=_(u'Political Groups'), required=False, + # value_type=schema.Choice(title=_(u'Political Group'), + # required=False, source=possible_polgroups)) + session = schema.Choice(title=_(u'Legislature / Session'), required=False, + source=possible_sessions) + ttitle = schema.TextLine(title=_(u'Title'), required=False) l_topics = schema.List(title=_(u'Topics'), required=False, value_type=schema.Choice(required=False, source=possible_topics)); - session = schema.Choice(title=_(u'Legislature / Session'), required=False, - source=possible_sessions) + text = schema.TextLine(title=_(u'Text'), required=False) + nodoc = schema.TextLine(title=_(u'Document Number'), required=False) start = schema.Date(title=_(u'Start'), required=False) end = schema.Date(title=_(u'End'), required=False) adopted = schema.Bool(title=_(u'Limit to adopted'), required=False, default=True)