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

use placeholders for missing item pages, remove item from getItem result

Browse source
This commit is contained in:
j 2011-05-26 09:34:52 +02:00
commit 5ca80fd7ee
4 changed files with 46 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

2
pandora/item/views.py
View file

@ -312,7 +312,7 @@ def getItem(request):
info = item.get_json()
info['stream'] = item.get_stream()
info['layers'] = item.get_layers(request.user)
response['data']['item'] = info
response['data'] = info
else:
response = json_response(status=403, text='permission denied')
return render_to_json_response(response)

4
pandora/user/views.py
View file

@ -11,7 +11,7 @@ from django.utils import simplejson as json
from django.conf import settings
from django.core.mail import send_mail, BadHeaderError
from ox.django.shortcuts import render_to_json_response, json_response
from ox.django.shortcuts import render_to_json_response, json_response, get_object_or_404_json
from ox.django.decorators import login_required_json
import ox
@ -451,7 +451,7 @@ def setUI(request):
profile.save()
if data.get('item', False):
item = Item.objects.get(itemId=data['item'])
item = get_object_or_404_json(Item, itemId=data['item'])
if request.user.is_authenticated():
access, created = Access.objects.get_or_create(item=item, user=request.user)
else: