From dee8c2622bec31d6cee2c26b9c58c172d879ec37 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= <fpeters@0d.be>
Date: Mon, 3 Oct 2011 17:08:54 +0200
Subject: [PATCH] Add a stable url for deputy photo, and use it in json output

---
 themis/datatypes/configure.zcml |  6 ++++++
 themis/datatypes/views.py       | 10 +++++++++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/themis/datatypes/configure.zcml b/themis/datatypes/configure.zcml
index 072f276..cd01e45 100644
--- a/themis/datatypes/configure.zcml
+++ b/themis/datatypes/configure.zcml
@@ -19,6 +19,12 @@
         permission="zope2.View"
         />
 
+    <browser:page
+        for="themis.datatypes.deputy.IDeputy"
+        name="photo"
+        class=".views.DeputyPhoto"
+        permission="zope2.View"
+        />
 
     <!-- Register an extension profile to make the product installable -->
     <genericsetup:registerProfile
diff --git a/themis/datatypes/views.py b/themis/datatypes/views.py
index 5a2af5b..68cb084 100644
--- a/themis/datatypes/views.py
+++ b/themis/datatypes/views.py
@@ -13,11 +13,12 @@ class DeputyJson(BrowserView):
            'district': self.context.district,
            'birthplace': self.context.birthplace,
            'bio': self.context.bio,
-           'picture': None, #XXX: link to picture
            'website': self.context.website,
            'degrees': self.context.degrees,
            'mandates': self.context.mandates,
         }
+        if self.context.picture:
+           d['picture'] = self.context.absolute_url() + '/photo'
         if self.context.birthdate:
            d['birthdate'] = self.context.birthdate.strftime('%Y-%m-%d')
         if self.context.private_address:
@@ -29,3 +30,10 @@ class DeputyJson(BrowserView):
 
         self.request.response.setHeader('Content-type', 'application/json')
         return json.dumps(d)
+
+class DeputyPhoto(BrowserView):
+    def __call__(self):
+        self.request.response.setHeader('Content-type',
+                       self.context.picture.contentType)
+        return self.context.picture.data
+