0x2620/pandora
2
1
Fork 1
Code Issues 1.2k Pull requests Releases Wiki Activity

setUI, setPreferences

Browse source
This commit is contained in:
j 2011-01-11 17:21:09 +05:30
commit 68fa703eb8
2 changed files with 43 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

16
pandora/user/models.py
View file

@ -21,6 +21,7 @@ class UserProfile(models.Model):
files_updated = models.DateTimeField(default=datetime.now)
newsletter = models.BooleanField(default=True)
ui = DictField(default={})
preferences = DictField(default={})
def user_post_save(sender, instance, **kwargs):
profile, new = UserProfile.objects.get_or_create(user=instance)
@ -28,17 +29,6 @@ def user_post_save(sender, instance, **kwargs):
models.signals.post_save.connect(user_post_save, sender=User)
class Preference(models.Model):
user = models.ForeignKey(User, related_name='preferences')
created = models.DateTimeField(auto_now_add=True)
modified = models.DateTimeField(auto_now=True)
key = models.CharField(blank=True, max_length=255)
value = models.TextField(blank=True)
def __unicode__(self):
return u"%s/%s=%s" % (self.user, self.key, self.value)
def get_user_json(user):
result = {}
for key in ('username', ):
@ -77,9 +67,7 @@ def get_ui(user):
def get_preferences(user):
prefs = {}
for p in Preference.objects.filter(user=user):
prefs[p.key] = json.loads(p.value)
prefs = user.get_profile().preferences
prefs['email'] = user.email
return prefs