Merge pull request #6036 from ccnmtl/global-annot-fix

Don't fail when asset has multiple global annotations

Author: nikolas

mediathread/djangosherd/models.py

@@ -216,12 +216,18 @@ def global_annotation(self, asset, author, auto_create=True):
         created = False
 
         if auto_create:
-            gannotation, created = self.get_or_create(**args)
+            try:
+                gannotation, created = self.get_or_create(**args)
+            except SherdNote.MultipleObjectsReturned:
+                gannotation = self.filter(**args).first()
+                created = False
         else:
             try:
                 gannotation = self.get(**args)
             except SherdNote.DoesNotExist:
                 gannotation = None
+            except SherdNote.MultipleObjectsReturned:
+                gannotation = self.filter(**args).first()
 
             return gannotation, False