diff --git a/pandora/archive/models.py b/pandora/archive/models.py index 483b32f2..ace88ad2 100644 --- a/pandora/archive/models.py +++ b/pandora/archive/models.py @@ -207,9 +207,6 @@ 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) if resolution == (0, 0): resolution = None diff --git a/static/js/pandora/filesView.js b/static/js/pandora/filesView.js index fc1da149..836a676a 100644 --- a/static/js/pandora/filesView.js +++ b/static/js/pandora/filesView.js @@ -183,7 +183,7 @@ pandora.ui.filesView = function(options, self) { } }), callback); }, - keys: ['wanted'], + keys: ['wanted', 'instances'], scrollbarVisible: true, sort: [{key: 'path', operator: '+'}] }) diff --git a/static/js/pandora/infoView.padma.js b/static/js/pandora/infoView.padma.js index eb1f84cf..ae0552a2 100644 --- a/static/js/pandora/infoView.padma.js +++ b/static/js/pandora/infoView.padma.js @@ -167,8 +167,8 @@ pandora.ui.infoView = function(data) { .append( Ox.Editable({ clickLink: pandora.clickLink, - placeholder: formatLight('unknown'), editable: isEditable, + placeholder: formatLight('unknown'), tooltip: isEditable ? 'Doubleclick to edit' : '', type: 'textarea', value: data.description || ''