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

rename Item.itemId to Item.public_id

Browse source
This commit is contained in:
j 2014-09-19 12:26:46 +00:00
commit 3232ce6989
44 changed files with 382 additions and 213 deletions
Download patch file Download diff file Expand all files Collapse all files

4
pandora/user/views.py
View file

@ -537,7 +537,7 @@ Positions
query = parse_query(data, request.user)
qs = order_query(query['qs'], query['sort'])
if qs.count() > 0:
response['data']['position'] = utils.get_positions(ids, [qs[0].itemId])[0]
response['data']['position'] = utils.get_positions(ids, [qs[0].public_id])[0]
elif 'positions' in data:
ids = [i.get_id() for i in qs]
response['data']['positions'] = utils.get_positions(ids, data['positions'])
@ -788,7 +788,7 @@ def setUI(request):
request.session['ui'] = json.dumps(ui)
if data.get('item'):
item = get_object_or_404_json(Item, itemId=data['item'])
item = get_object_or_404_json(Item, public_id=data['item'])
if request.user.is_authenticated():
access, created = Access.objects.get_or_create(item=item, user=request.user)
else: