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

Compare commits

base: 0x2620:fdd5101bc7af5a84415161b05ad9858c6e5bd148
Branches Tags
0x2620:master
0x2620:stable
..
compare: 0x2620:190e07ef90741fe9f8df10426cf5ad2534465104
Branches Tags
0x2620:master
0x2620:stable

No commits in common. "fdd5101bc7af5a84415161b05ad9858c6e5bd148" and "190e07ef90741fe9f8df10426cf5ad2534465104" have entirely different histories.
fdd5101bc7 ... 190e07ef90

2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
pandora/app/views.py
View file

@ -247,7 +247,7 @@ def getEmbedDefaults(request, data):
level = settings.CONFIG['capabilities']['canSeeItem']['guest'] level = settings.CONFIG['capabilities']['canSeeItem']['guest']
qs = Item.objects.filter(level__lte=level, rendered=True).order_by('sort__public_id') qs = Item.objects.filter(level__lte=level, rendered=True).order_by('sort__public_id')
if qs.exists(): if qs.exists():
i = qs[0].cache i = qs[0].json
response['data']['item'] = i['id'] response['data']['item'] = i['id']
response['data']['itemDuration'] = i['duration'] response['data']['itemDuration'] = i['duration']
response['data']['itemRatio'] = i['videoRatio'] response['data']['itemRatio'] = i['videoRatio']

3
pandora/oxdjango/api/views.py
View file

@ -4,6 +4,7 @@ from __future__ import division, absolute_import
import json import json
from django.shortcuts import render_to_response from django.shortcuts import render_to_response
from django.template import RequestContext
from django.conf import settings from django.conf import settings
from ..shortcuts import render_to_json_response, json_response, HttpErrorJson from ..shortcuts import render_to_json_response, json_response, HttpErrorJson
@ -26,7 +27,7 @@ def api(request):
for f in sorted(methods): for f in sorted(methods):
api.append({'name': f, api.append({'name': f,
'doc': actions.doc(f).replace('\n', '<br>\n')}) 'doc': actions.doc(f).replace('\n', '<br>\n')})
context = { context = RequestContext(request, {
'api': api, 'api': api,
'settings': settings, 'settings': settings,
'sitename': settings.SITENAME 'sitename': settings.SITENAME