only return instances if requested

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

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: '+'}]
         })

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 || ''