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

2
pandora/document/managers.py
View file

@ -11,7 +11,7 @@ def parseCondition(condition, user, item=None):
k = condition.get('key', 'name')
k = {
'user': 'user__username',
'item': 'items__itemId',
'item': 'items__public_id',
}.get(k, k)
if not k:
k = 'name'

2
pandora/document/models.py
View file

@ -166,7 +166,7 @@ class Document(models.Model):
response[key] = getattr(self, _map.get(key,key)) or ''
if item:
if isinstance(item, basestring):
item = Item.objects.get(itemId=item)
item = Item.objects.get(public_id=item)
d = self.descriptions.filter(item=item)
if d.exists():
if 'description' in keys and d[0].description:

10
pandora/document/views.py
View file

@ -47,7 +47,7 @@ def addDocument(request):
ids = [data['id']]
if 'item' in data:
if isinstance(data['item'], basestring):
item = Item.objects.get(itemId=data['item'])
item = Item.objects.get(public_id=data['item'])
if item.editable(request.user):
for id in ids:
document = models.Document.get(id)
@ -55,7 +55,7 @@ def addDocument(request):
else:
response = json_response(status=403, text='permission denied')
else:
for item in Item.objects.filter(itemId__in=data['item']):
for item in Item.objects.filter(public_id__in=data['item']):
if item.editable(request.user):
for id in ids:
document = models.Document.get(id)
@ -79,7 +79,7 @@ def editDocument(request):
'''
response = json_response()
data = json.loads(request.POST['data'])
item = 'item' in data and Item.objects.get(itemId=data['item']) or None
item = 'item' in data and Item.objects.get(public_id=data['item']) or None
if data['id']:
document = models.Document.get(data['id'])
if document.editable(request.user, item):
@ -230,7 +230,7 @@ def removeDocument(request):
ids = data['ids']
else:
ids = [data['id']]
item = 'item' in data and Item.objects.get(itemId=data['item']) or None
item = 'item' in data and Item.objects.get(public_id=data['item']) or None
if item:
if item.editable(request.user):
for id in ids:
@ -261,7 +261,7 @@ def sortDocuments(request):
'''
data = json.loads(request.POST['data'])
index = 0
item = Item.objects.get(itemId=data['item'])
item = Item.objects.get(public_id=data['item'])
ids = data['ids']
if item.editable(request.user):
for i in ids: