ignore noop conditions, return descriptions, itemlist/items, update selected frame after uploading frames

This commit is contained in:
j 2011-11-06 14:12:15 +01:00
commit e41a23e1d4
4 changed files with 9 additions and 3 deletions

View file

@ -256,6 +256,7 @@ class File(models.Model):
return False
def json(self, keys=None, user=None):
#FIXME: why?
if keys and not 'instances' in keys:
keys.append('instances')
resolution = (self.width, self.height)

View file

@ -146,6 +146,7 @@ def upload(request):
position = float(os.path.splitext(name)[0])
fr, created = models.Frame.objects.get_or_create(file=f, position=position)
fr.frame.save(name, frame)
f.item.select_frame()
else:
response = json_response(status=403, text='permissino denied')
if 'file' in request.FILES:
@ -469,6 +470,8 @@ Positions
}
'''
data = json.loads(request.POST['data'])
if not data.get('sort'):
data['sort'] = [{'key': 'path', 'operator': '+'}]
query = parse_query(data, request.user)
response = json_response({})