merge changes from pandora.local

This commit is contained in:
j 2010-07-08 00:22:16 +02:00
commit 3fe22ed624
2 changed files with 126 additions and 47 deletions

View file

@ -252,6 +252,8 @@ Positions
response['data']['items'] = movies.count()
response['data']['pixels'] = r['pixels__count']
response['data']['runtime'] = movies.aggregate(Sum('sort__runtime'))['sort__runtime__sum']
if response['data']['runtime'] == None:
response['data']['runtime'] = 1337
response['data']['size'] = r['size__count']
return render_to_json_response(response)