document folded annotations, include clip_id in annots

pandora/annotation/models.py

@@ -378,6 +378,8 @@ class Annotation(models.Model):
                 streams = self.item.streams()
                 if streams:
                     j['videoRatio'] = streams[0].aspect_ratio
+            if 'clip' in keys:
+                j[key] = self.clip.public_id
             for key in keys:
                 if key not in j:
                     if key in self._clip_keys:

pandora/clip/views.py

@@ -78,7 +78,7 @@ def findClips(request, data):
     takes {
         query: object, // find clips, query object, see `find`
         itemsQuery: object, // limit to matching items, query object, see `find`
-        keys: [string], // list of properties to return
+        keys: [string], // list of properties to return, include 'annotations' to get all annotations for a clip
         positions: [int], // list of positions
         range: [int, int], // range of results to return
         sort: [object] // list of sort objects, see `find`