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

2011-11-06 14:12:15 +01:00 · 2011-11-06 14:12:15 +01:00 · e41a23e1d4
commit e41a23e1d4
parent de52b3966d
4 changed files with 9 additions and 3 deletions
--- a/pandora/archive/models.py
+++ b/pandora/archive/models.py
@ -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)