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

Compare commits

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

2 commits
190e07ef90 ... fdd5101bc7

Author SHA1 Message Date
j
fdd5101bc7 RequestContext->dict 2018-07-15 00:38:15 +02:00
j
cb0d1ec37f json->cache 2018-07-15 00:38:08 +02:00
2 changed files with 2 additions and 3 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].json i = qs[0].cache
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,7 +4,6 @@ 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
@ -27,7 +26,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 = RequestContext(request, { context = {
'api': api, 'api': api,
'settings': settings, 'settings': settings,
'sitename': settings.SITENAME 'sitename': settings.SITENAME