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

python functions should not be camelCase

Browse source
This commit is contained in:
j 2010-11-27 13:12:53 +01:00
commit ff9612a3f0
8 changed files with 46 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

14
pandora/user/models.py
View file

@ -27,7 +27,7 @@ class Preference(models.Model):
key = models.CharField(blank=True, max_length=255)
value = models.TextField(blank=True)
def getUserJSON(user):
def get_user_json(user):
json = {}
for key in ('username', ):
json[key] = getattr(user, key)
@ -36,11 +36,11 @@ def getUserJSON(user):
json['group'] = 'admin'
elif user.has_perm('0x.vip'): #FIXME: permissions
json['group'] = 'vip'
json['preferences'] = getPreferences(user)
json['ui'] = getUI(user)
json['preferences'] = get_preferences(user)
json['ui'] = get_ui(user)
return json
def getUI(user):
def get_ui(user):
return {
"columns": ["id", "title", "director", "country", "year", "language", "genre"],
"findQuery": {"conditions": [{"key": "", "value": "", "operator": ""}], "operator": ""},
@ -61,14 +61,14 @@ def getUI(user):
"theme": "classic"
}
def getPreferences(user):
def get_preferences(user):
prefs = {}
for p in Preference.objects.filter(user=user):
prefs[p.key] = json.loads(p.value)
prefs['email'] = user.email
return prefs
def getPreference(user, key, value=None):
def get_preference(user, key, value=None):
if key in ('email', ):
value = getattr(user, key)
else:
@ -77,7 +77,7 @@ def getPreference(user, key, value=None):
value = json.loads(q[0].value)
return value
def setPreference(user, key, value):
def set_preference(user, key, value):
if key in ('email', ):
setattr(user, key, value)
user.save()

12
pandora/user/views.py
View file

@ -39,7 +39,7 @@ def api_login(request):
if user is not None:
if user.is_active:
login(request, user)
user_json = models.getUserJSON(user)
user_json = models.get_user_json(user)
response = json_response({'user': user_json},
text='You are logged in.')
else:
@ -227,21 +227,21 @@ def api_preferences(request):
'''
response = json_response()
if 'data' not in request.POST:
response['data']['preferences'] = models.getPreferences(request.user)
response['data']['preferences'] = models.get_preferences(request.user)
else:
data = json.loads(request.POST['data'])
if isinstance(data, basestring):
response['data']['preferences'] = {}
response['data']['preferences'][data] = models.getPreference(request.user, data)
response['data']['preferences'][data] = models.get_preference(request.user, data)
elif isinstance(data, list):
response['data']['preferences'] = {}
for preference in data:
response['preferences'][preference] = models.getPreference(request.user, preference)
response['preferences'][preference] = models.get_preference(request.user, preference)
elif isinstance(data, dict):
if not data:
response['data']['preferences'] = models.getPreferences(request.user)
response['data']['preferences'] = models.get_preferences(request.user)
else:
del response['data']
for key in data:
models.setPreference(request.user, key, data[key])
models.set_preference(request.user, key, data[key])
return render_to_json_response(response)