0x2620/cablegates
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

use app.config.itemKeys, add Ox.Filter

Browse source
This commit is contained in:
rlx 2011-01-23 04:58:40 +00:00
commit c1b9c196d5
3 changed files with 117 additions and 88 deletions
Download patch file Download diff file Expand all files Collapse all files

12
pandora/api/views.py
View file

@ -52,18 +52,18 @@ def init(request):
'''
#data = json.loads(request.POST['data'])
response = json_response({})
if request.user.is_authenticated():
response['data']['user'] = get_user_json(request.user)
else:
response['data']['user'] = {'name': 'Guest',
'group': 'guest',
'preferences': {}}
with open(settings.SITE_CONFIG) as f:
response['data']['config'] = json.load(f)
response['data']['config']['site']['id'] = settings.SITEID
response['data']['config']['site']['name'] = settings.SITENAME
response['data']['config']['site']['sectionName'] = settings.SITENAME
response['data']['config']['site']['url'] = settings.URL
if request.user.is_authenticated():
response['data']['user'] = get_user_json(request.user)
else:
response['data']['user'] = response['data']['config']['user']
return render_to_json_response(response)
actions.register(init)