From 2e23a28bb5c60c614f24c3a925c90f5f44bccbe8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= Date: Thu, 12 Apr 2012 12:39:56 +0200 Subject: [PATCH] add a rich text biography field to deputies --- themis/datatypes/deputy.py | 3 ++- themis/datatypes/views.py | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/themis/datatypes/deputy.py b/themis/datatypes/deputy.py index d854d7c..eb4204c 100644 --- a/themis/datatypes/deputy.py +++ b/themis/datatypes/deputy.py @@ -41,7 +41,8 @@ class IDeputy(form.Schema): district = schema.TextLine(title=_(u'District'), required=False) birthplace = schema.TextLine(title=_(u'Birthplace'), required=False) - bio = schema.Text(title=_(u'Bio'), required=False) + bio = schema.Text(title=_(u'Bio (oneline)'), required=False) + biography = RichText(title=_(u'Biography'), required=False) picture = NamedBlobImage(title=_(u'Picture'), required=False) website = schema.TextLine(title=_(u'Website'), required=False) degrees = schema.Text(title=_(u'Degrees'), required=False) diff --git a/themis/datatypes/views.py b/themis/datatypes/views.py index 7ee3ba6..c83927b 100644 --- a/themis/datatypes/views.py +++ b/themis/datatypes/views.py @@ -35,6 +35,8 @@ class DeputyJson(BrowserView): d['current_functions'] = self.context.current_functions.raw if self.context.past_functions and self.context.past_functions.raw: d['past_functions'] = self.context.past_functions.raw + if self.context.biography and self.context.biography.raw: + d['biography'] = self.context.biography.raw self.request.response.setHeader('Content-type', 'application/json') return json.dumps(d)