subscription
This commit is contained in:
parent
d2b0c18001
commit
c577e6930b
7 changed files with 129 additions and 83 deletions
|
|
@ -23,6 +23,26 @@ class UserProfile(models.Model):
|
|||
ui = DictField(default={})
|
||||
preferences = DictField(default={})
|
||||
|
||||
def get_preferences(self):
|
||||
prefs = self.preferences
|
||||
prefs['email'] = self.user.email
|
||||
return prefs
|
||||
|
||||
def get_ui(self):
|
||||
ui = {}
|
||||
ui.update(site_config['user']['ui'])
|
||||
ui.update(self.ui)
|
||||
if not 'lists' in ui:
|
||||
ui['lists'] = {}
|
||||
ui['lists'][''] = site_config['uiDefaults']['list']
|
||||
ids = [l.get_id() for l in self.user.lists.all()]
|
||||
ids += [l.get_id() for l in self.user.subscribed_lists.all()]
|
||||
ids += [l.get_id() for l in List.objects.filter(status='featured').exclude(user=self.user)]
|
||||
for l in ids:
|
||||
if l not in ui['lists']:
|
||||
ui['lists'][l] = ui['lists']['']
|
||||
return ui
|
||||
|
||||
def user_post_save(sender, instance, **kwargs):
|
||||
profile, new = UserProfile.objects.get_or_create(user=instance)
|
||||
|
||||
|
|
@ -30,6 +50,7 @@ models.signals.post_save.connect(user_post_save, sender=User)
|
|||
|
||||
|
||||
def get_user_json(user):
|
||||
profile = user.get_profile()
|
||||
result = {}
|
||||
for key in ('username', ):
|
||||
result[key] = getattr(user, key)
|
||||
|
|
@ -38,61 +59,6 @@ def get_user_json(user):
|
|||
result['group'] = 'admin'
|
||||
elif user.has_perm('0x.vip'): #FIXME: permissions
|
||||
result['group'] = 'vip'
|
||||
result['preferences'] = get_preferences(user)
|
||||
result['ui'] = get_ui(user)
|
||||
result['preferences'] = profile.get_preferences()
|
||||
result['ui'] = profile.get_ui()
|
||||
return result
|
||||
|
||||
|
||||
def get_ui(user):
|
||||
return site_config['user']['ui']
|
||||
'''
|
||||
return {
|
||||
"columns": ["id", "title", "director", "country", "year", "language", "genre"],
|
||||
"findQuery": {"conditions": [], "operator": ""},
|
||||
"groupsQuery": {"conditions": [], "operator": "|"},
|
||||
"groupsSize": 128,
|
||||
"itemView": "timeline",
|
||||
"listQuery": {"conditions": [], "operator": ""},
|
||||
"listsSize": 192,
|
||||
"listView": "icons",
|
||||
"sections": ["history", "lists", "public", "featured"],
|
||||
"showGroups": True,
|
||||
"showInfo": True,
|
||||
"showLists": True,
|
||||
"showMovies": True,
|
||||
"sort": settings.DEFAULT_SORT,
|
||||
"theme": settings.DEFAULT_THEME
|
||||
}
|
||||
'''
|
||||
|
||||
|
||||
def get_preferences(user):
|
||||
prefs = user.get_profile().preferences
|
||||
prefs['email'] = user.email
|
||||
return prefs
|
||||
|
||||
|
||||
def get_preference(user, key, value=None):
|
||||
if key in ('email', ):
|
||||
value = getattr(user, key)
|
||||
else:
|
||||
q = Preference.objects.filter(user=user, key=key)
|
||||
if q.count() > 0:
|
||||
value = json.loads(q[0].value)
|
||||
return value
|
||||
|
||||
|
||||
def set_preference(user, key, value):
|
||||
if key in ('email', ):
|
||||
setattr(user, key, value)
|
||||
user.save()
|
||||
else:
|
||||
value = json.dumps(value)
|
||||
q = Preference.objects.filter(user=user, key=key)
|
||||
if q.count() > 0:
|
||||
p = q[0]
|
||||
p.value = value
|
||||
p.save()
|
||||
else:
|
||||
p = Preference(user=user, key=key, value=value)
|
||||
p.save()
|
||||
|
|
|
|||
|
|
@ -408,7 +408,12 @@ def setUI(request):
|
|||
param data {
|
||||
key.subkey: value
|
||||
}
|
||||
return
|
||||
you can set nested keys
|
||||
api.setUI({"lists.my.listView": "icons"})
|
||||
|
||||
return {
|
||||
'status': {'code': int, 'text': string}
|
||||
}
|
||||
'''
|
||||
data = json.loads(request.POST['data'])
|
||||
keys = data.keys()[0].split('.')
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue