From 24f94a092ec50e9f333083a95337f8413be9ac01 Mon Sep 17 00:00:00 2001
From: j <0x006A@0x2620.org>
Date: Tue, 18 Oct 2011 23:28:58 +0200
Subject: [PATCH] email

---
 pandora/user/models.py | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/pandora/user/models.py b/pandora/user/models.py
index c1128eb0..3797c69b 100644
--- a/pandora/user/models.py
+++ b/pandora/user/models.py
@@ -33,11 +33,6 @@ class UserProfile(models.Model):
     info = DictField(default={})
     notes = models.TextField(default='')
 
-    def get_preferences(self):
-        prefs = self.preferences
-        prefs['email'] = self.user.email
-        return prefs
-
     def get_ui(self):
         return get_ui(self.ui, self.user)
 
@@ -154,7 +149,7 @@ def init_user(user, request=None):
         result[key] = getattr(user, key)
     result['level'] = profile.get_level()
     result['groups'] = [g.name for g in user.groups.all()]
-    result['preferences'] = profile.get_preferences()
+    result['email'] = user.email
     result['ui'] = profile.get_ui()
     result['volumes'] = [v.json() for v in user.volumes.all()] 
     return result