decentral1se/pandora
1
0
Fork 0
forked from 0x2620/pandora
Code Issues Pull requests Projects 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

6
pandora/itemlist/models.py
View file

@ -92,7 +92,7 @@ class List(models.Model):
if item:
ListItem.objects.all().filter(item=item, list=self).delete()
if items:
ListItem.objects.all().filter(item__itemId__in=items, list=self).delete()
ListItem.objects.all().filter(item__public_id__in=items, list=self).delete()
def __unicode__(self):
return self.get_id()
@ -231,14 +231,14 @@ class List(models.Model):
poster_frames = []
for i in range(0, items.count(), max(1, int(items.count()/4))):
poster_frames.append({
'item': items[int(i)].itemId,
'item': items[int(i)].public_id,
'position': items[int(i)].poster_frame
})
self.poster_frames = tuple(poster_frames)
self.save()
for i in self.poster_frames:
from item.models import Item
qs = Item.objects.filter(itemId=i['item'])
qs = Item.objects.filter(public_id=i['item'])
if qs.count() > 0:
frame = qs[0].frame(i['position'])
if frame:

6
pandora/itemlist/views.py
View file

@ -159,7 +159,7 @@ def addListItems(request):
if 'items' in data:
if list.editable(request.user):
with transaction.commit_on_success():
for item in Item.objects.filter(itemId__in=data['items']):
for item in Item.objects.filter(public_id__in=data['items']):
list.add(item)
response = json_response(status=200, text='items added')
else:
@ -216,7 +216,7 @@ def orderListItems(request):
index = 0
with transaction.commit_on_success():
for i in data['ids']:
models.ListItem.objects.filter(list=list, item__itemId=i).update(index=index)
models.ListItem.objects.filter(list=list, item__public_id=i).update(index=index)
index += 1
else:
response = json_response(status=403, text='permission denied')
@ -265,7 +265,7 @@ def addList(request):
update_numberoflists.delay(request.user.username)
if 'items' in data:
for item in Item.objects.filter(itemId__in=data['items']):
for item in Item.objects.filter(public_id__in=data['items']):
list.add(item)
if list.status == 'featured':