Fix #5431 - Typo in models

[mediagoblin.git] / mediagoblin / db / models.py

diff --git a/mediagoblin/db/models.py b/mediagoblin/db/models.py
index 77f8a1b80be6899b6afba423033a4d9e1fa4ae3e..3f36f2279273b15b4d0b722d1129d9473d8c6a89 100644 (file)
--- a/mediagoblin/db/models.py
+++ b/mediagoblin/db/models.py
@@ -607,7 +607,7 @@ class MediaEntry(Base, MediaEntryMixin, CommentingMixin):
         if ascending:
             query = query.order_by(Comment.added.asc())
         else:
-            qury = query.order_by(Comment.added.desc())
+            query = query.order_by(Comment.added.desc())
         
         return FakeCursor(query, lambda c:c.comment())
  
@@ -1008,6 +1008,17 @@ class TextComment(Base, TextCommentMixin, CommentingMixin):
                                               cascade="all, delete-orphan"))
     deletion_mode = Base.SOFT_DELETE
 
+    def soft_delete(self, *args, **kwargs):
+        # Find the GMR for this model.
+        gmr = GenericModelReference.query.filter_by(
+            obj_pk=self.id,
+            model_type=self.__tablename__
+        ).first()
+
+        # Delete the Comment object for this comment
+        Comment.query.filter_by(comment_id=gmr.id).delete()
+        return super(TextComment, self).soft_delete(*args, **kwargs)
+
     def serialize(self, request):
         """ Unserialize to python dictionary for API """
         target = self.get_reply_to()
@@ -1347,7 +1358,7 @@ class Report(Base):
     resolved = Column(DateTime)
     result = Column(UnicodeText)
     
-    object_id = Column(Integer, ForeignKey(GenericModelReference.id), nullable=False)
+    object_id = Column(Integer, ForeignKey(GenericModelReference.id), nullable=True)
     object_helper = relationship(GenericModelReference)
     obj = association_proxy("object_helper", "get_object",
                             creator=GenericModelReference.find_or_new)