Bug 1110801 - Don't allow creating multiple identical document/attac…

…hment M2M relationships.
mdn · Mar 3, 2016 · b14c0b4 · b14c0b4
1 parent 93db364
commit b14c0b4
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/kuma/attachments/models.py b/kuma/attachments/models.py
@@ -60,13 +60,6 @@ def attach(self, document, user, revision):
         try:
             document_attachment = (document.files.through.objects
                                                          .get(pk=self.pk))
-        except MultipleObjectsReturned:
-            # There may be multiple uploaded files referenced in the document
-            # content which could have created multiple of the intermediates
-            # TODO: what to do with the others?
-            document_attachment = (document.files.through.objects
-                                                         .filter(pk=self.pk)
-                                                         .first())
         except document.files.through.DoesNotExist:
             # no previous uploads found, create a new document-attachment
             document.files.through.objects.create(file=self,

diff --git a/kuma/wiki/models.py b/kuma/wiki/models.py
@@ -189,6 +189,15 @@ class Meta:
     def __unicode__(self):
         return u'"%s" for document "%s"' % (self.file, self.document)
 
+    def clean(self):
+        if self.pk and (self.document.files.through.objects.exclude(pk=self.pk)
+                                                           .exists()):
+            raise ValidationError(
+                _("Attachment %(attachment_id)s can't be attached "
+                  "multiple times to document %(document_id)s") %
+                {'attachment_id': self.pk, 'document_id': self.document.pk}
+            )
+
 
 @register_live_index
 class Document(NotificationsMixin, models.Model):