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

merge

Browse source
This commit is contained in:
rolux 2011-11-11 13:21:09 +00:00
commit 3152ea2e20
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
pandora/item/models.py
View file

@ -1162,6 +1162,7 @@ attrs = {
'duration': models.FloatField(null=True, blank=True, db_index=True), 'duration': models.FloatField(null=True, blank=True, db_index=True),
'width': models.BigIntegerField(null=True, blank=True, db_index=True), 'width': models.BigIntegerField(null=True, blank=True, db_index=True),
'height': models.BigIntegerField(null=True, blank=True, db_index=True), 'height': models.BigIntegerField(null=True, blank=True, db_index=True),
'created': models.DateTimeField(null=True, blank=True, db_index=True),
} }
for key in filter(lambda k: 'columnWidth' in k or k['type'] in ('integer', 'time', 'float', 'date', 'enum'), settings.CONFIG['itemKeys']): for key in filter(lambda k: 'columnWidth' in k or k['type'] in ('integer', 'time', 'float', 'date', 'enum'), settings.CONFIG['itemKeys']):
name = key['id'] name = key['id']

1
pandora/user/views.py
View file

@ -696,6 +696,7 @@ def setUI(request):
access, created = Access.objects.get_or_create(item=item, user=request.user) access, created = Access.objects.get_or_create(item=item, user=request.user)
else: else:
access, created = Access.objects.get_or_create(item=item, user=None) access, created = Access.objects.get_or_create(item=item, user=None)
if not created:
access.save() access.save()
response = json_response() response = json_response()